Merge "Replace String for 'path' to File" into rvc-dev