modify custom if perf test
Merging origin/dval/master-pending-custom-perf-test-fix into master