Merge branch 'hotfix/0.3.1' into develop