Merge "Partially revert ag/10355722 to fix perf regression" into rvc-dev