Merge "Disable broken tests" into sc-dev