Merge "Add tests for renaming from SHELL" into rvc-dev