3 Commits (CLDC-4246-re-apply-changes)