Adds support for groupBy(Object/Type) per DARI-37 JIRA issue
Merge branch 'release/2.1'