Merge branch 'release/enhance-layout' into develop
Merge branch 'develop'