Merge branch 'branch-0.14.0'