Merge "Further improve performance of VRR" into main