Merge branch 'perf/scripting' into perf/core