Merge branch 'release/0.11.1' into develop
Fix
Update version
Merge branch 'release/0.11.2'