Merge branch 'develop' into hotfix-0.9.3