Merge branch 'release0.4.0' into develop