Merge "Fix CTS tests" into rvc-dev