Merge "Maintain compatibility by deleting target directory before renaming into it." into rvc-dev