Merge "Fix testMultipleConditions flake" into rvc-dev