Merge "Fixes various failing cts" into sc-dev