Merge branch 'hotfix/v0.3.1' into develop
Merge branch 'develop'