Merge remote-tracking branch 'remotes/origin/trunk' into branch-3.0-perf