Merge branch 'hotfix/0.1.0dev' into develop