[fix] Broken groups management by #4308
Merge pull request #5152 from phproberto/broken-groups

[fix] Broken groups management by #4308