Merge "Rebasing ag/10503271 into the rvc-dev branch." into rvc-dev