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