Merge branch 'release/7' into develop
Fix CSS
Merge branch 'release/8'