Add all users and related tests
Merge branch 'feature-add-all-users' into develop