Merge branch 'perf/live' into perf/core