Merge pull request #1646 from clebertsuconic/2.4.x

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