re #9876, fixes scoping issue
Merge remote-tracking branch 'origin/feature/9876_fix_perf_test'