7.0 partner grouping

Merged Gabriel Davini requested to merge 7.0-partner_grouping into 7.0-stage

Merge request reports