[#64260566] Fix scopes on grouping to make sure we only get a grouping once
Merge branch 'master' of github.com:cconstantine/wattle