Merge "Fix broken perf tests" into oc-dev