Merge branch 'perf/core'