Merge "Temporarily ignoring a broken test" into sc-dev