Merge branch 'hotfix/version' into develop
~ base
~ version
Merge branch 'release/0.9.11'