Merge "Fix parallelNoCache perf test" into sc-dev