Merge "Fix package equivalence tests" into sc-dev