Merge "Backporting the change of ag/15629060 to rvc-dev" into rvc-dev