Merge branch 'branch-0.9'