Merge branch 'perf/urgent' into perf/core, to pick up fixes before merging new changes