Merge "Remove unused setter" into rvc-dev