(CE-3) Final tweaks
Merge branch 'CE-3' into dev