[MOD] Fix Groups

Merged Jose Luis Zanotti requested to merge 12.0-Fix_groups into 12.0-stage

Merge request reports