Merge "Address missed comments from previous CL" into rvc-dev