Merge branch 'release/0.4'
Merge branch 'develop'
Release bump