Merge "Backport of ag/14170751 and ag/14170752." into rvc-qpr-dev