3 Commits (CLDC-3790-continued)