Merge branch 'perf/urgent' into perf/core, to fix up fixes before queueing up new...