Merge branch 'release/0.4.0' into dev