Use separate runs for perf profiling

@bug W-2306915@
Merging origin/rsalvador/master-pending/perf-tune into master