Merge "Reduce PerformanceTest#testDirOperations size" into rvc-dev