Merge branch 'hotfix/0.9.40a'