Merge branch 'branch-3.0'