reenabling aae for users and groups.
Merge branch 'test' into dev