Merge "Fix CTS Failure" into sc-dev