Merge branch 'perf/intel-json-files-2' into perf/builtin-json-4