fix group count
Merge branch 'master' into storeWorkExtIdsAsJson