Merge branch 'release-0.7'