Merge "Fix CTS" into rvc-dev