Merge branch 'release/0.4' into develop