Merge "Skip Route tests that are R-specific on Q" into rvc-dev