Merge "Disabling flaky test until fix is found" into rvc-dev