Merge branch 'develop' into hotfix-0.1alpha2.5