Merge "Fix broken test" into sc-dev