Merge branch 'hotfix/center-style' into develop
Merge branch 'develop'