Merge "Add onUserAdded/Removed methods"