Merge branch 'design_merge'
Submit comments on enter
Merge branch 'master' into design_merge