Merge branch 'cc/perf-run-config'