Merge branch 'trunk' into branch-3.0-perf