Merge branch 'layout' into 'master'