Merge "Fix a flaky test" into rvc-dev