Bump version/patch
Merge branch 'release/0.4.0-p1' into develop