Merge "Remove flaky annotation" into rvc-dev