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