Merge "Addressing CL comments." into rvc-dev