fix
Merge branch 'hotfix-0.11.1'