Another group consolidation.

Unfortunately, since I don't know which groups were consolidated, I don't know if this is a good idea or a bad one.