Merge pull request #1639 from clebertsuconic/2.3.x.fix

https://bugzilla.redhat.com/show_bug.cgi?id=1096942 - Fixing Clustered Grouping issues