Merge branch 'rfc/perf' into perf/core, because it's ready for inclusion