delete users and remove from list
Merge remote-tracking branch 'origin/develop' into develop