Merge pull request #1920 from spbnick/auth_type_system_removal