Merge branch 'branch-3.0-perf' into trunk