Merge "Partial revert of ag/10482633" into rvc-dev