[MOD] Simplified `group-by` logic regarding collations.
Merge pull request #730 from LeoWoerteler/simpler-group-by

[MOD] Simplified `group-by` logic regarding collations.