Merge branch 'release/v0.4.0' into develop