7.0 groups on menus

Merged Sebastian Kennedy requested to merge 7.0-groups_on_menus into 7.0-stage

Merge request reports