Merge branch 'adjust-layout'
Merge branch 'master' into adjust-layout