Merge "Fix CTS crash" into rvc-dev