Merge branch 'snapshot-release-0.4.0'