Use window groups correctly

Merged Maximiliano requested to merge (removed):window-groups into master

Merge request reports