Merge branch 'branch-0.6.0'