Merge "Remove unnecessary dependencies" into rvc-dev