Merge "Address ag/11032295 leftover comments" into rvc-dev