Merge "Suppress group changes in group pruning"