Merge 'tip/perf/urgent' into perf/core to pick fixes