LPS-37581 Add ability to disable grouping for activity sets
LPS-37581 Avoid using the word group when possible. It's too loaded.