Moved all grouping to Mask/Group tab. Re #6212.