Merge "Remove unnecessary strings" into rvc-dev