Merge "Use MANAGE_USERS permission to check for admin user" into main