Merge "Fix regression in perf testing" into main