Issue 7936 by sgl: Using more groups
Issue 7936 by sgl: Move group definition to masterfile