NXCONNECT-622 make grouping more configurable