v1.1.0 pre-release fixes
Merge branch 'release/1.1.0' into develop