diff --git a/Changes b/Changes
index 2409b535..018a518f 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,15 @@
+2.045000 - 2020-04-15
+
+  [NEW FEATURES]
+
+  * API for search, objects, and reports: https://github.com/netdisco/netdisco/wiki/API
+
+  [ENHANCEMENTS]
+
+  * #442 add device ip, port and vlan to the node vendor report results
+  * #674 added support for Clavister SSH collection (Henningen)
+  * #707 change SSHCollector::NXOS to use expect (rc9000)
+
 2.044015 - 2020-02-12
 
   [BUG FIXES]
diff --git a/MANIFEST b/MANIFEST
index 83cce8aa..219b09d2 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -22,6 +22,7 @@ lib/App/Netdisco/Backend/Role/Scheduler.pm
 lib/App/Netdisco/Configuration.pm
 lib/App/Netdisco/DB.pm
 lib/App/Netdisco/DB/ExplicitLocking.pm
+lib/App/Netdisco/DB/Result.pm
 lib/App/Netdisco/DB/Result/Admin.pm
 lib/App/Netdisco/DB/Result/Community.pm
 lib/App/Netdisco/DB/Result/Device.pm
@@ -102,6 +103,7 @@ lib/App/Netdisco/JobQueue/PostgreSQL.pm
 lib/App/Netdisco/SSHCollector/Platform/ACE.pm
 lib/App/Netdisco/SSHCollector/Platform/ASA.pm
 lib/App/Netdisco/SSHCollector/Platform/BigIP.pm
+lib/App/Netdisco/SSHCollector/Platform/Clavister.pm
 lib/App/Netdisco/SSHCollector/Platform/CPVSX.pm
 lib/App/Netdisco/SSHCollector/Platform/FreeBSD.pm
 lib/App/Netdisco/SSHCollector/Platform/GAIAEmbedded.pm
@@ -132,6 +134,7 @@ lib/App/Netdisco/Util/Statistics.pm
 lib/App/Netdisco/Util/Web.pm
 lib/App/Netdisco/Web.pm
 lib/App/Netdisco/Web/AdminTask.pm
+lib/App/Netdisco/Web/API/Objects.pm
 lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
 lib/App/Netdisco/Web/AuthN.pm
 lib/App/Netdisco/Web/Device.pm
@@ -217,6 +220,7 @@ lib/App/Netdisco/Worker/Plugin/DiscoverAll.pm
 lib/App/Netdisco/Worker/Plugin/DumpConfig.pm
 lib/App/Netdisco/Worker/Plugin/Expire.pm
 lib/App/Netdisco/Worker/Plugin/ExpireNodes.pm
+lib/App/Netdisco/Worker/Plugin/GetAPIKey.pm
 lib/App/Netdisco/Worker/Plugin/Graph.pm
 lib/App/Netdisco/Worker/Plugin/Location.pm
 lib/App/Netdisco/Worker/Plugin/Macsuck.pm
@@ -233,7 +237,6 @@ lib/App/Netdisco/Worker/Plugin/PortName.pm
 lib/App/Netdisco/Worker/Plugin/Power.pm
 lib/App/Netdisco/Worker/Plugin/Psql.pm
 lib/App/Netdisco/Worker/Plugin/Renumber.pm
-lib/App/Netdisco/Worker/Plugin/SetUserToken.pm
 lib/App/Netdisco/Worker/Plugin/Show.pm
 lib/App/Netdisco/Worker/Plugin/Stats.pm
 lib/App/Netdisco/Worker/Plugin/Vlan.pm
@@ -390,6 +393,8 @@ share/swagger-ui/index.html
 share/swagger-ui/oauth2-redirect.html
 share/swagger-ui/swagger-ui-bundle.js
 share/swagger-ui/swagger-ui-bundle.js.map
+share/swagger-ui/swagger-ui-json-tree-plugin.js
+share/swagger-ui/swagger-ui-json-tree-plugin.js.map
 share/swagger-ui/swagger-ui-standalone-preset.js
 share/swagger-ui/swagger-ui-standalone-preset.js.map
 share/swagger-ui/swagger-ui.css
@@ -492,6 +497,7 @@ share/views/js/device.js
 share/views/js/report.js
 share/views/js/search.js
 share/views/layouts/main.tt
+share/views/layouts/noop.tt
 share/views/password.tt
 share/views/plugin.tt
 share/views/report.tt
diff --git a/META.json b/META.json
index a3f00527..95e8bc4c 100644
--- a/META.json
+++ b/META.json
@@ -124,7 +124,7 @@
    "provides" : {
       "App::Netdisco" : {
          "file" : "lib/App/Netdisco.pm",
-         "version" : "2.044015"
+         "version" : "2.045000"
       },
       "App::Netdisco::AnyEvent::Nbtstat" : {
          "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm"
@@ -151,6 +151,9 @@
       "App::Netdisco::DB::ExplicitLocking" : {
          "file" : "lib/App/Netdisco/DB/ExplicitLocking.pm"
       },
+      "App::Netdisco::DB::Result" : {
+         "file" : "lib/App/Netdisco/DB/Result.pm"
+      },
       "App::Netdisco::DB::Result::Admin" : {
          "file" : "lib/App/Netdisco/DB/Result/Admin.pm"
       },
@@ -394,6 +397,9 @@
       "App::Netdisco::SSHCollector::Platform::CPVSX" : {
          "file" : "lib/App/Netdisco/SSHCollector/Platform/CPVSX.pm"
       },
+      "App::Netdisco::SSHCollector::Platform::Clavister" : {
+         "file" : "lib/App/Netdisco/SSHCollector/Platform/Clavister.pm"
+      },
       "App::Netdisco::SSHCollector::Platform::FreeBSD" : {
          "file" : "lib/App/Netdisco/SSHCollector/Platform/FreeBSD.pm"
       },
@@ -478,6 +484,9 @@
       "App::Netdisco::Web" : {
          "file" : "lib/App/Netdisco/Web.pm"
       },
+      "App::Netdisco::Web::API::Objects" : {
+         "file" : "lib/App/Netdisco/Web/API/Objects.pm"
+      },
       "App::Netdisco::Web::AdminTask" : {
          "file" : "lib/App/Netdisco/Web/AdminTask.pm"
       },
@@ -736,6 +745,9 @@
       "App::Netdisco::Worker::Plugin::ExpireNodes" : {
          "file" : "lib/App/Netdisco/Worker/Plugin/ExpireNodes.pm"
       },
+      "App::Netdisco::Worker::Plugin::GetAPIKey" : {
+         "file" : "lib/App/Netdisco/Worker/Plugin/GetAPIKey.pm"
+      },
       "App::Netdisco::Worker::Plugin::Graph" : {
          "file" : "lib/App/Netdisco/Worker/Plugin/Graph.pm"
       },
@@ -784,9 +796,6 @@
       "App::Netdisco::Worker::Plugin::Renumber" : {
          "file" : "lib/App/Netdisco/Worker/Plugin/Renumber.pm"
       },
-      "App::Netdisco::Worker::Plugin::SetUserToken" : {
-         "file" : "lib/App/Netdisco/Worker/Plugin/SetUserToken.pm"
-      },
       "App::Netdisco::Worker::Plugin::Show" : {
          "file" : "lib/App/Netdisco/Worker/Plugin/Show.pm"
       },
@@ -827,6 +836,6 @@
       "x_IRC" : "irc://irc.freenode.org/#netdisco",
       "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users"
    },
-   "version" : "2.044015",
+   "version" : "2.045000",
    "x_serialization_backend" : "JSON::PP version 2.97001"
 }
diff --git a/META.yml b/META.yml
index 1037a8f4..9cfb0e9a 100644
--- a/META.yml
+++ b/META.yml
@@ -23,7 +23,7 @@ name: App-Netdisco
 provides:
   App::Netdisco:
     file: lib/App/Netdisco.pm
-    version: '2.044015'
+    version: '2.045000'
   App::Netdisco::AnyEvent::Nbtstat:
     file: lib/App/Netdisco/AnyEvent/Nbtstat.pm
   App::Netdisco::Backend::Job:
@@ -41,6 +41,8 @@ provides:
     version: '61'
   App::Netdisco::DB::ExplicitLocking:
     file: lib/App/Netdisco/DB/ExplicitLocking.pm
+  App::Netdisco::DB::Result:
+    file: lib/App/Netdisco/DB/Result.pm
   App::Netdisco::DB::Result::Admin:
     file: lib/App/Netdisco/DB/Result/Admin.pm
   App::Netdisco::DB::Result::Community:
@@ -203,6 +205,8 @@ provides:
     file: lib/App/Netdisco/SSHCollector/Platform/BigIP.pm
   App::Netdisco::SSHCollector::Platform::CPVSX:
     file: lib/App/Netdisco/SSHCollector/Platform/CPVSX.pm
+  App::Netdisco::SSHCollector::Platform::Clavister:
+    file: lib/App/Netdisco/SSHCollector/Platform/Clavister.pm
   App::Netdisco::SSHCollector::Platform::FreeBSD:
     file: lib/App/Netdisco/SSHCollector/Platform/FreeBSD.pm
   App::Netdisco::SSHCollector::Platform::GAIAEmbedded:
@@ -259,6 +263,8 @@ provides:
     file: lib/App/Netdisco/Util/Web.pm
   App::Netdisco::Web:
     file: lib/App/Netdisco/Web.pm
+  App::Netdisco::Web::API::Objects:
+    file: lib/App/Netdisco/Web/API/Objects.pm
   App::Netdisco::Web::AdminTask:
     file: lib/App/Netdisco/Web/AdminTask.pm
   App::Netdisco::Web::Auth::Provider::DBIC:
@@ -431,6 +437,8 @@ provides:
     file: lib/App/Netdisco/Worker/Plugin/Expire.pm
   App::Netdisco::Worker::Plugin::ExpireNodes:
     file: lib/App/Netdisco/Worker/Plugin/ExpireNodes.pm
+  App::Netdisco::Worker::Plugin::GetAPIKey:
+    file: lib/App/Netdisco/Worker/Plugin/GetAPIKey.pm
   App::Netdisco::Worker::Plugin::Graph:
     file: lib/App/Netdisco/Worker/Plugin/Graph.pm
   App::Netdisco::Worker::Plugin::Location:
@@ -463,8 +471,6 @@ provides:
     file: lib/App/Netdisco/Worker/Plugin/Psql.pm
   App::Netdisco::Worker::Plugin::Renumber:
     file: lib/App/Netdisco/Worker/Plugin/Renumber.pm
-  App::Netdisco::Worker::Plugin::SetUserToken:
-    file: lib/App/Netdisco/Worker/Plugin/SetUserToken.pm
   App::Netdisco::Worker::Plugin::Show:
     file: lib/App/Netdisco/Worker/Plugin/Show.pm
   App::Netdisco::Worker::Plugin::Stats:
@@ -569,5 +575,5 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/bsd-license.php
   repository: https://github.com/netdisco/netdisco
-version: '2.044015'
+version: '2.045000'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/lib/App/Netdisco.pm b/lib/App/Netdisco.pm
index 7dd67ddd..823eaa0b 100644
--- a/lib/App/Netdisco.pm
+++ b/lib/App/Netdisco.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use 5.010_000;
 
-our $VERSION = '2.044015';
+our $VERSION = '2.045000';
 use App::Netdisco::Configuration;
 
 =head1 NAME