Merge "Stop overwriting files" into rvc-dev