Merge "[VRR] Fix trace mismatch" into main