Merge "Ignore flaky test" into rvc-dev