Merge branch 'release/v0.4' into develop
Merge remote-tracking branch 'origin/develop' into develop