Merge branch 'branch-0.7.0'