Merge "Refactor getAllUsers"