Update with subgroups fix

Closed Vitor Lopes requested to merge (removed):master into master

Merge request reports