Merge "Update CTS shim" into sc-dev