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