Merge "Make checking for singular SPs in list instead of list equality"