Nested groups patch adapted to Icehouse-2 release