all groups and users handled
Merge branch 'xpacne00_local'