Merge branch 'release/beta1'
Merge branch 'hotfix/css' into develop