Merge branch 'hotfix-0.11.5'