Fixed list for org and group.
Merge branch 'test' into dev