Merge branch 'perf/urgent' into perf/core, to resolve a conflict