Merge "Introduce param/column for group count"