Merge pull request #10008 from richard-cox/get-groups-improvements-pr

Merge pull request #10008 from richard-cox/get-groups-improvements-pr #39