GCL1-12948 and start of rework on grouping