Merge "Fix broken perf tests"