Merge branch 'hotfix-0.10.1'
Merge branch 'release-0.11.0'
fix
Merge branch 'hotfix-0.11.1' into develop