fix bug with group ids
Merge branch 's-hist' into staging2