Merge remote-tracking branch 'tip/perf/core' into perf/urgent