merge from HEAD - dump tokenGroups as sids.