Merge branch 'release/2.1.0' into develop
Homepage fixes
Bump version
Merge branch 'release/2.1.1'