CMS-1221 Live Edit - Tuning of new Merged Menu
Merge remote branch 'origin/master'