MAP-620 and others:  REformulated group handling, disabled group sorting pending further investigation.