Use ByPropertyIdGrouper in Claims and deprecate ByPropertyIdArray