diff --git a/Changes b/Changes
index d13410ef..0bed0f40 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,19 @@
+2.064000 - 2023-07-22
+
+  [NEW FEATURES]
+
+  * #1063 allow ACLs to match custom_fields
+  * #1064 tags feature on devices and device ports (and ACLs)
+
+  [ENHANCEMENTS]
+
+  * #1072 remove stale custom fields keys on rediscover
+
+  [BUG FIXES]
+
+  * 1067b82d custom fields can only be set when device or port config matches
+  * #1062 fix job queue submit API to support extra field as subaction
+
 2.063004 - 2023-07-15
 
   [BUG FIXES]
diff --git a/MANIFEST b/MANIFEST
index dd195ebf..66c56062 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -126,6 +126,7 @@ lib/App/Netdisco/SSHCollector/Platform/PaloAlto.pm
 lib/App/Netdisco/SSHCollector/Platform/VOSS.pm
 lib/App/Netdisco/Transport/SNMP.pm
 lib/App/Netdisco/Transport/SSH.pm
+lib/App/Netdisco/Util/CustomFields.pm
 lib/App/Netdisco/Util/Device.pm
 lib/App/Netdisco/Util/DeviceAuth.pm
 lib/App/Netdisco/Util/DNS.pm
@@ -234,6 +235,7 @@ lib/App/Netdisco/Worker/Plugin/Discover/PortPower.pm
 lib/App/Netdisco/Worker/Plugin/Discover/PortProperties.pm
 lib/App/Netdisco/Worker/Plugin/Discover/PortProperties/PortAccessEntity.pm
 lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
+lib/App/Netdisco/Worker/Plugin/Discover/Properties/Tags.pm
 lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm
 lib/App/Netdisco/Worker/Plugin/Discover/Wireless.pm
 lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
@@ -485,6 +487,7 @@ share/schema_versions/App-Netdisco-DB-77-78-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-78-79-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-79-80-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql
+share/schema_versions/App-Netdisco-DB-80-81-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-9-10-PostgreSQL.sql
 share/views/admintask.tt
 share/views/ajax/admintask/duplicatedevices.tt
diff --git a/META.json b/META.json
index 21a28d36..c706bcc5 100644
--- a/META.json
+++ b/META.json
@@ -136,7 +136,7 @@
    "provides" : {
       "App::Netdisco" : {
          "file" : "lib/App/Netdisco.pm",
-         "version" : "2.063004"
+         "version" : "2.064000"
       },
       "App::Netdisco::AnyEvent::Nbtstat" : {
          "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm"
@@ -158,7 +158,7 @@
       },
       "App::Netdisco::DB" : {
          "file" : "lib/App/Netdisco/DB.pm",
-         "version" : "80"
+         "version" : "81"
       },
       "App::Netdisco::DB::ExplicitLocking" : {
          "file" : "lib/App/Netdisco/DB/ExplicitLocking.pm"
@@ -475,6 +475,9 @@
       "App::Netdisco::Transport::SSH" : {
          "file" : "lib/App/Netdisco/Transport/SSH.pm"
       },
+      "App::Netdisco::Util::CustomFields" : {
+         "file" : "lib/App/Netdisco/Util/CustomFields.pm"
+      },
       "App::Netdisco::Util::DNS" : {
          "file" : "lib/App/Netdisco/Util/DNS.pm"
       },
@@ -799,6 +802,9 @@
       "App::Netdisco::Worker::Plugin::Discover::Properties" : {
          "file" : "lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm"
       },
+      "App::Netdisco::Worker::Plugin::Discover::Properties::Tags" : {
+         "file" : "lib/App/Netdisco/Worker/Plugin/Discover/Properties/Tags.pm"
+      },
       "App::Netdisco::Worker::Plugin::Discover::VLANs" : {
          "file" : "lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm"
       },
@@ -935,6 +941,6 @@
       "x_IRC" : "irc://irc.libera.chat/#netdisco",
       "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users"
    },
-   "version" : "2.063004",
+   "version" : "2.064000",
    "x_serialization_backend" : "JSON::PP version 4.07"
 }
diff --git a/META.yml b/META.yml
index 1726b2a6..e01cb8d1 100644
--- a/META.yml
+++ b/META.yml
@@ -23,7 +23,7 @@ name: App-Netdisco
 provides:
   App::Netdisco:
     file: lib/App/Netdisco.pm
-    version: '2.063004'
+    version: '2.064000'
   App::Netdisco::AnyEvent::Nbtstat:
     file: lib/App/Netdisco/AnyEvent/Nbtstat.pm
   App::Netdisco::Backend::Job:
@@ -38,7 +38,7 @@ provides:
     file: lib/App/Netdisco/Configuration.pm
   App::Netdisco::DB:
     file: lib/App/Netdisco/DB.pm
-    version: '80'
+    version: '81'
   App::Netdisco::DB::ExplicitLocking:
     file: lib/App/Netdisco/DB/ExplicitLocking.pm
   App::Netdisco::DB::Result:
@@ -249,6 +249,8 @@ provides:
     file: lib/App/Netdisco/Transport/SNMP.pm
   App::Netdisco::Transport::SSH:
     file: lib/App/Netdisco/Transport/SSH.pm
+  App::Netdisco::Util::CustomFields:
+    file: lib/App/Netdisco/Util/CustomFields.pm
   App::Netdisco::Util::DNS:
     file: lib/App/Netdisco/Util/DNS.pm
   App::Netdisco::Util::Device:
@@ -465,6 +467,8 @@ provides:
     file: lib/App/Netdisco/Worker/Plugin/Discover/PortProperties/PortAccessEntity.pm
   App::Netdisco::Worker::Plugin::Discover::Properties:
     file: lib/App/Netdisco/Worker/Plugin/Discover/Properties.pm
+  App::Netdisco::Worker::Plugin::Discover::Properties::Tags:
+    file: lib/App/Netdisco/Worker/Plugin/Discover/Properties/Tags.pm
   App::Netdisco::Worker::Plugin::Discover::VLANs:
     file: lib/App/Netdisco/Worker/Plugin/Discover/VLANs.pm
   App::Netdisco::Worker::Plugin::Discover::Wireless:
@@ -645,5 +649,5 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/BSD-3-Clause
   repository: https://github.com/netdisco/netdisco
-version: '2.063004'
+version: '2.064000'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/lib/App/Netdisco.pm b/lib/App/Netdisco.pm
index 94a17af6..39a3b239 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.063004';
+our $VERSION = '2.064000';
 use App::Netdisco::Configuration;
 
 =head1 NAME