Merge branch 'hotfix/0.3.4'
-
Merge branch 'hotfix/0.3.5' into develop