Merge branch 'release/0.3.4' into develop
Merge branch 'develop'