0.9.40a
Merge branch 'hotfix/0.9.40a' into develop