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