Merge "Introduce more user management APIs"