Merge branch 'perf/core' into perf/updates