Merge "Implement addUsers()/removeUsers() in derived classes"