Merge branch 'release-0.4'