Merge "Improve performance of VRR" into main