]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#3477] fixed comments and unittests
authorRazvan Becheriu <razvan@isc.org>
Mon, 22 Jul 2024 17:24:03 +0000 (20:24 +0300)
committerFrancis Dupont <fdupont@isc.org>
Thu, 1 Aug 2024 07:23:54 +0000 (09:23 +0200)
doc/examples/ddns/all-keys.json
doc/examples/kea4/comments.json
doc/examples/kea6/comments.json
src/bin/d2/d2_process.cc
src/bin/d2/parser_context.cc
src/bin/dhcp4/ctrl_dhcp4_srv.cc
src/bin/dhcp4/tests/get_config_unittest.cc
src/bin/dhcp6/ctrl_dhcp6_srv.cc
src/lib/yang/tests/config_unittests.cc

index c2930e4774232c488d0b3f27857b2d4cba79a919..48da3b1a7bb56a1e051f7f60dcd2c20d87fb6bbc 100644 (file)
@@ -98,7 +98,7 @@
                     // This specifies an authorized client.
                     {
                         // The user id must not be empty or contain
-                        // the ':' character. It is a mandatoryparameter.
+                        // the ':' character. It is a mandatory parameter.
                         "user": "admin",
 
                         // If password is not specified an empty
index af013d4a49d1f07c5b6c66a0110fc7ef04ce63d6..8e1a49d95658831096c62daa9abed587e4a64873 100644 (file)
@@ -63,7 +63,7 @@
            "socket-type": "http",
            "socket-address": "::1",
            "socket-port": 8000,
-           
+
            // In authentication
            "authentication": {
                "comment": "basic HTTP authentication",
index 6da240e34d8ba153e5c12f4b02d7989bcb40ba17..ce63a0e310d1553f4691ae9fe8fb177ed8e26c6a 100644 (file)
@@ -63,7 +63,7 @@
            "socket-type": "http",
            "socket-address": "127.0.0.1",
            "socket-port": 8000,
-           
+
            // In authentication
            "authentication": {
                "comment": "basic HTTP authentication",
index 19a23eaeaa8a0579f9f5721c4f4f30eecfaa07b8..b221d9dfedc41a0d20dc0b2ca54bd761d9b7308e 100644 (file)
@@ -76,7 +76,7 @@ D2Process::D2Process(const char* name, const asiolink::IOServicePtr& io_service)
 void
 D2Process::init() {
     using namespace isc::config;
-    // CommandMgrs use IO service to run asynchronous socket operations.
+    // CommandMgr and HttpCommandMgr use IO service to run asynchronous socket operations.
     CommandMgr::instance().setIOService(getIOService());
     HttpCommandMgr::instance().setIOService(getIOService());
 
index ac5a3d4f5e21c2537f88d2c16d688feb98c138d4..d70212e2fab39e76303bc039140869dedf7e6e41 100644 (file)
@@ -169,25 +169,25 @@ D2ParserContext::contextName()
     case TSIG_KEYS:
         return ("tsig-keys");
     case ALGORITHM:
-        return("algorithm");
+        return ("algorithm");
     case DIGEST_BITS:
-        return("digest-bits");
+        return ("digest-bits");
     case SECRET:
-        return("secret");
+        return ("secret");
     case FORWARD_DDNS:
-        return("forward-ddns");
+        return ("forward-ddns");
     case REVERSE_DDNS:
-        return("reverse-ddns");
+        return ("reverse-ddns");
     case DDNS_DOMAIN:
-        return("ddns-domain");
+        return ("ddns-domain");
     case DDNS_DOMAINS:
-        return("ddns-domains");
+        return ("ddns-domains");
     case DNS_SERVER:
-        return("dns-server");
+        return ("dns-server");
     case DNS_SERVERS:
-        return("dns-servers");
+        return ("dns-servers");
     case CONTROL_SOCKET:
-        return("control-socket");
+        return ("control-socket");
     case CONTROL_SOCKET_TYPE:
         return ("control-socket-type");
     case AUTHENTICATION:
index 3a42ea42530311d9e6b46d43f1301d8f4488f2ec..99e1673cee30c3dc93b6f699538dfda8ad0eecee 100644 (file)
@@ -1081,7 +1081,7 @@ ControlledDhcpv4Srv::ControlledDhcpv4Srv(uint16_t server_port /*= DHCP4_SERVER_P
     // TimerMgr uses IO service to run asynchronous timers.
     TimerMgr::instance()->setIOService(getIOService());
 
-    // CommandMgr's use IO service to run asynchronous socket operations.
+    // CommandMgr and HttpCommandMgr use IO service to run asynchronous socket operations.
     CommandMgr::instance().setIOService(getIOService());
     HttpCommandMgr::instance().setIOService(getIOService());
 
index ea94dad6182fe2b07a559d1ab9a595197edc105b..c92d761324f0f96ad1b3e37d046777e0a39eba9c 100644 (file)
 #include <testutils/user_context_utils.h>
 #include <dhcp/testutils/iface_mgr_test_config.h>
 #include <dhcpsrv/cfgmgr.h>
-#include <dhcpsrv/parsers/simple_parser6.h>
-#include <dhcp6/dhcp6_srv.h>
-#include <dhcp6/ctrl_dhcp6_srv.h>
-#include <dhcp6/json_config_parser.h>
-#include <dhcp6/tests/dhcp6_test_utils.h>
-#include <dhcp6/tests/get_config_unittest.h>
+#include <dhcpsrv/parsers/simple_parser4.h>
+#include <dhcp4/dhcp4_srv.h>
+#include <dhcp4/ctrl_dhcp4_srv.h>
+#include <dhcp4/json_config_parser.h>
+#include <dhcp4/tests/dhcp4_test_utils.h>
+#include <dhcp4/tests/get_config_unittest.h>
 #include <testutils/gtest_utils.h>
 
 #include <boost/algorithm/string.hpp>
@@ -42,20 +42,20 @@ namespace {
 /// Copy get_config_unittest.cc.skel into get_config_unittest.cc
 ///
 /// For the extracted configurations define the EXTRACT_CONFIG and
-/// recompile this file. Run dhcp6_unittests on Dhcp6ParserTest
+/// recompile this file. Run dhcp4_unittests on Dhcp4ParserTest
 /// redirecting the standard error to a temporary file, e.g. by
 /// @code
-///    ./dhcp6_unittests --gtest_filter="Dhcp6Parser*" > /dev/null 2> x
+///    ./dhcp4_unittests --gtest_filter="Dhcp4Parser*" > /dev/null 2> x
 /// @endcode
 ///
 /// Update EXTRACTED_CONFIGS with the file content
 ///
 /// When configurations have been extracted the corresponding unparsed
 /// configurations must be generated. To do that define GENERATE_ACTION
-/// and recompile this file. Run dhcp6_unittests on Dhcp6GetConfigTest
+/// and recompile this file. Run dhcp4_unittests on Dhcp4GetConfigTest
 /// redirecting the standard error to a temporary file, e.g. by
 /// @code
-///    ./dhcp6_unittests --gtest_filter="Dhcp6GetConfig*" > /dev/null 2> u
+///    ./dhcp4_unittests --gtest_filter="Dhcp4GetConfig*" > /dev/null 2> u
 /// @endcode
 ///
 /// Update UNPARSED_CONFIGS with the file content, recompile this file
@@ -75,10 +75,9 @@ const char* EXTRACTED_CONFIGS[] = {
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 1
@@ -87,409 +86,482 @@ const char* EXTRACTED_CONFIGS[] = {
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"max-preferred-lifetime\": 4000,\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"id\": 1,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            }\n"
+"        ],\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 2
+"{\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"renew-timer\": 1000,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"id\": 1,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            }\n"
+"        ],\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 3
+"{\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
 "        \"max-valid-lifetime\": 5000,\n"
-"        \"min-preferred-lifetime\": 2000,\n"
 "        \"min-valid-lifetime\": 3000,\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 2
+    // CONFIGURATION 4
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1024,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 100,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:2::/80\"\n"
+"                        \"pool\": \"192.0.3.101 - 192.0.3.150\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:2::/64\"\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:3::/80\"\n"
+"                        \"pool\": \"192.0.4.101 - 192.0.4.150\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:3::/64\"\n"
+"                \"subnet\": \"192.0.4.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 34,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:4::/80\"\n"
+"                        \"pool\": \"192.0.5.101 - 192.0.5.150\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:4::/64\"\n"
+"                \"subnet\": \"192.0.5.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 3
+    // CONFIGURATION 5
 "{\n"
+"        \"boot-file-name\": \"bar\",\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
+"        \"next-server\": \"1.2.3.4\",\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"server-hostname\": \"foo\",\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
-"                    }\n"
-"                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
-"            },\n"
-"            {\n"
-"                \"id\": 2,\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"pool\": \"2001:db8:2::/80\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:2::/64\"\n"
-"            },\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            }\n"
+"        ],\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 6
+"{\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"subnet4\": [\n"
 "            {\n"
-"                \"id\": 3,\n"
+"                \"boot-file-name\": \"bar\",\n"
+"                \"id\": 1,\n"
+"                \"next-server\": \"1.2.3.4\",\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:3::/80\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:3::/64\"\n"
-"            },\n"
+"                \"server-hostname\": \"foo\",\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            }\n"
+"        ],\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 7
+"{\n"
+"        \"boot-file-name\": \"nofile\",\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"next-server\": \"192.0.0.1\",\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"server-hostname\": \"nohost\",\n"
+"        \"subnet4\": [\n"
 "            {\n"
-"                \"id\": 4,\n"
+"                \"boot-file-name\": \"bootfile.efi\",\n"
+"                \"id\": 1,\n"
+"                \"next-server\": \"1.2.3.4\",\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:4::/80\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:4::/64\"\n"
+"                \"server-hostname\": \"some-name.example.org\",\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 4
+    // CONFIGURATION 8
 "{\n"
-"        \"compatibility\": {\n"
-"            \"lenient-option-parsing\": true\n"
-"        },\n"
+"        \"echo-client-id\": false,\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 5
+    // CONFIGURATION 9
 "{\n"
+"        \"echo-client-id\": true,\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"max-preferred-lifetime\": 4000,\n"
-"        \"max-valid-lifetime\": 5000,\n"
-"        \"min-preferred-lifetime\": 2000,\n"
-"        \"min-valid-lifetime\": 3000,\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 4,\n"
-"                \"max-valid-lifetime\": 5,\n"
-"                \"min-preferred-lifetime\": 2,\n"
-"                \"min-valid-lifetime\": 3,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3,\n"
-"                \"rebind-timer\": 2,\n"
-"                \"renew-timer\": 1,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
-"                \"valid-lifetime\": 4\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 6
+    // CONFIGURATION 10
 "{\n"
+"        \"compatibility\": {\n"
+"            \"exclude-first-last-24\": true,\n"
+"            \"ignore-dhcp-server-identifier\": true,\n"
+"            \"ignore-rai-link-selection\": true,\n"
+"            \"lenient-option-parsing\": true\n"
+"        },\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
-"                \"interface\": \"eth0\",\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 7
+    // CONFIGURATION 11
 "{\n"
-"        \"preferred-lifetime\": 3000,\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
-"                \"interface-id\": \"foobar\",\n"
+"                \"match-client-id\": true,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            },\n"
+"            {\n"
+"                \"id\": 2,\n"
+"                \"match-client-id\": false,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.3.1 - 192.0.3.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 8
+    // CONFIGURATION 12
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
+"        \"match-client-id\": true,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
+"                \"match-client-id\": false,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/96\"\n"
-"                    },\n"
-"                    {\n"
-"                        \"pool\": \"2001:db8:1:0:abcd::/112\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 2,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:2::1 - 2001:db8:2::ff\"\n"
-"                    },\n"
-"                    {\n"
-"                        \"pool\": \"2001:db8:2::300 - 2001:db8:2::3ff\"\n"
+"                        \"pool\": \"192.0.3.1 - 192.0.3.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:2::/64\"\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 9
+    // CONFIGURATION 13
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"authoritative\": true,\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            },\n"
+"            {\n"
+"                \"authoritative\": false,\n"
+"                \"id\": 2,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.3.1 - 192.0.3.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 10
+    // CONFIGURATION 14
 "{\n"
+"        \"authoritative\": true,\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"authoritative\": false,\n"
 "                \"id\": 1,\n"
-"                \"pd-pools\": [\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 128,\n"
-"                        \"prefix\": \"2001:db8:1::\",\n"
-"                        \"prefix-len\": 64\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
-"                \"valid-lifetime\": 4000\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            },\n"
+"            {\n"
+"                \"id\": 2,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.3.1 - 192.0.3.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            }\n"
-"        ]\n"
+"        ],\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 11
+    // CONFIGURATION 15
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
+"        \"max-valid-lifetime\": 5000,\n"
+"        \"min-valid-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
-"                \"pd-pools\": [\n"
+"                \"max-valid-lifetime\": 5,\n"
+"                \"min-valid-lifetime\": 3,\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"excluded-prefix\": \"3000:0:0:0:1000::\",\n"
-"                        \"excluded-prefix-len\": 72,\n"
-"                        \"prefix\": \"3000::\",\n"
-"                        \"prefix-len\": 48\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
-"                \"valid-lifetime\": 4000\n"
+"                \"rebind-timer\": 2,\n"
+"                \"renew-timer\": 1,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"valid-lifetime\": 4\n"
 "            }\n"
-"        ]\n"
+"        ],\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 12
+    // CONFIGURATION 16
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
-"                \"pd-pools\": [\n"
-"                    {\n"
-"                        \"delegated-len\": 80,\n"
-"                        \"prefix\": \"2001:db8:1:01::\",\n"
-"                        \"prefix-len\": 72\n"
-"                    },\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 88,\n"
-"                        \"prefix\": \"2001:db8:1:02::\",\n"
-"                        \"prefix-len\": 72\n"
+"                        \"pool\": \"192.0.2.0/28\"\n"
 "                    },\n"
 "                    {\n"
-"                        \"delegated-len\": 96,\n"
-"                        \"prefix\": \"3000:1:03::\",\n"
-"                        \"prefix-len\": 72\n"
+"                        \"pool\": \"192.0.2.200-192.0.2.255\"\n"
 "                    }\n"
 "                ],\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            },\n"
+"            {\n"
+"                \"id\": 2,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1:04::/80\"\n"
+"                        \"pool\": \"192.0.3.0/25\"\n"
+"                    },\n"
+"                    {\n"
+"                        \"pool\": \"192.0.3.128/25\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/40\",\n"
-"                \"valid-lifetime\": 4000\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            }\n"
-"        ]\n"
+"        ],\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 13
+    // CONFIGURATION 17
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
-"                \"pd-pools\": [\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"prefix\": \"2001:db8:1::\",\n"
-"                        \"prefix-len\": 64\n"
+"                        \"pool\": \"192.0.2.128/28\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
-"                \"valid-lifetime\": 4000\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
-"        ]\n"
+"        ],\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 14
+    // CONFIGURATION 18
 "{\n"
 "        \"option-def\": [\n"
 "            {\n"
 "                \"code\": 100,\n"
 "                \"name\": \"foo\",\n"
 "                \"space\": \"isc\",\n"
-"                \"type\": \"ipv6-address\"\n"
+"                \"type\": \"ipv4-address\"\n"
 "            }\n"
 "        ]\n"
 "    }\n",
-    // CONFIGURATION 15
+    // CONFIGURATION 19
 "{\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -501,7 +573,7 @@ const char* EXTRACTED_CONFIGS[] = {
 "            }\n"
 "        ]\n"
 "    }\n",
-    // CONFIGURATION 16
+    // CONFIGURATION 20
 "{\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -518,7 +590,7 @@ const char* EXTRACTED_CONFIGS[] = {
 "            }\n"
 "        ]\n"
 "    }\n",
-    // CONFIGURATION 17
+    // CONFIGURATION 21
 "{\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -530,7 +602,7 @@ const char* EXTRACTED_CONFIGS[] = {
 "            }\n"
 "        ]\n"
 "    }\n",
-    // CONFIGURATION 18
+    // CONFIGURATION 22
 "{\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -542,7 +614,29 @@ const char* EXTRACTED_CONFIGS[] = {
 "            }\n"
 "        ]\n"
 "    }\n",
-    // CONFIGURATION 19
+    // CONFIGURATION 23
+"{\n"
+"        \"option-def\": [\n"
+"            {\n"
+"                \"code\": 109,\n"
+"                \"name\": \"foo\",\n"
+"                \"space\": \"dhcp4\",\n"
+"                \"type\": \"string\"\n"
+"            }\n"
+"        ]\n"
+"    }\n",
+    // CONFIGURATION 24
+"{\n"
+"        \"option-def\": [\n"
+"            {\n"
+"                \"code\": 170,\n"
+"                \"name\": \"unassigned-option-170\",\n"
+"                \"space\": \"dhcp4\",\n"
+"                \"type\": \"string\"\n"
+"            }\n"
+"        ]\n"
+"    }\n",
+    // CONFIGURATION 25
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
@@ -552,63 +646,63 @@ const char* EXTRACTED_CONFIGS[] = {
 "            {\n"
 "                \"csv-format\": false,\n"
 "                \"data\": \"ABCDEF0105\",\n"
-"                \"name\": \"subscriber-id\"\n"
+"                \"name\": \"dhcp-message\"\n"
 "            },\n"
 "            {\n"
+"                \"csv-format\": false,\n"
 "                \"data\": \"01\",\n"
-"                \"name\": \"preference\"\n"
+"                \"name\": \"default-ip-ttl\"\n"
 "            }\n"
 "        ],\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 20
+    // CONFIGURATION 26
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"option-data\": [\n"
 "                    {\n"
 "                        \"csv-format\": false,\n"
 "                        \"data\": \"ABCDEF0105\",\n"
-"                        \"name\": \"subscriber-id\"\n"
+"                        \"name\": \"dhcp-message\"\n"
 "                    },\n"
 "                    {\n"
+"                        \"csv-format\": false,\n"
 "                        \"data\": \"01\",\n"
-"                        \"name\": \"preference\"\n"
+"                        \"name\": \"default-ip-ttl\"\n"
 "                    }\n"
 "                ],\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 21
+    // CONFIGURATION 27
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
@@ -618,7 +712,7 @@ const char* EXTRACTED_CONFIGS[] = {
 "            {\n"
 "                \"csv-format\": false,\n"
 "                \"data\": \"ABCDEF0105\",\n"
-"                \"name\": \"subscriber-id\"\n"
+"                \"name\": \"dhcp-message\"\n"
 "            },\n"
 "            {\n"
 "                \"data\": \"1234\",\n"
@@ -628,29 +722,28 @@ const char* EXTRACTED_CONFIGS[] = {
 "        ],\n"
 "        \"option-def\": [\n"
 "            {\n"
-"                \"code\": 38,\n"
+"                \"code\": 56,\n"
 "                \"name\": \"foo\",\n"
 "                \"space\": \"isc\",\n"
 "                \"type\": \"uint32\"\n"
 "            }\n"
 "        ],\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 22
+    // CONFIGURATION 28
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
@@ -670,24 +763,23 @@ const char* EXTRACTED_CONFIGS[] = {
 "        ],\n"
 "        \"option-def\": [\n"
 "            {\n"
-"                \"code\": 110,\n"
+"                \"code\": 1,\n"
 "                \"name\": \"foo\",\n"
 "                \"space\": \"isc\",\n"
 "                \"type\": \"uint32\"\n"
 "            },\n"
 "            {\n"
-"                \"code\": 111,\n"
+"                \"code\": 2,\n"
 "                \"name\": \"foo2\",\n"
 "                \"space\": \"isc\",\n"
 "                \"type\": \"ipv4-address\"\n"
 "            }\n"
 "        ],\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 23
+    // CONFIGURATION 29
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
@@ -711,152 +803,316 @@ const char* EXTRACTED_CONFIGS[] = {
 "        ],\n"
 "        \"option-def\": [\n"
 "            {\n"
-"                \"code\": 100,\n"
+"                \"code\": 222,\n"
 "                \"encapsulate\": \"isc\",\n"
 "                \"name\": \"base-option\",\n"
-"                \"space\": \"dhcp6\",\n"
+"                \"space\": \"dhcp4\",\n"
 "                \"type\": \"uint8\"\n"
 "            },\n"
 "            {\n"
-"                \"code\": 110,\n"
+"                \"code\": 1,\n"
 "                \"name\": \"foo\",\n"
 "                \"space\": \"isc\",\n"
 "                \"type\": \"uint32\"\n"
 "            },\n"
 "            {\n"
-"                \"code\": 111,\n"
+"                \"code\": 2,\n"
 "                \"name\": \"foo2\",\n"
 "                \"space\": \"isc\",\n"
 "                \"type\": \"ipv4-address\"\n"
 "            }\n"
 "        ],\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"id\": 1,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            }\n"
+"        ],\n"
+"        \"valid-lifetime\": 3000\n"
+"    }\n",
+    // CONFIGURATION 30
+"{\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"option-data\": [\n"
+"            {\n"
+"                \"csv-format\": false,\n"
+"                \"data\": \"AB\",\n"
+"                \"name\": \"dhcp-message\"\n"
+"            }\n"
+"        ],\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
+"                \"option-data\": [\n"
+"                    {\n"
+"                        \"csv-format\": false,\n"
+"                        \"data\": \"ABCDEF0105\",\n"
+"                        \"name\": \"dhcp-message\"\n"
+"                    },\n"
+"                    {\n"
+"                        \"csv-format\": false,\n"
+"                        \"data\": \"01\",\n"
+"                        \"name\": \"default-ip-ttl\"\n"
+"                    }\n"
+"                ],\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 24
+    // CONFIGURATION 31
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"option-data\": [\n"
 "                    {\n"
 "                        \"csv-format\": false,\n"
 "                        \"data\": \"0102030405060708090A\",\n"
-"                        \"name\": \"subscriber-id\"\n"
+"                        \"name\": \"dhcp-message\"\n"
 "                    }\n"
 "                ],\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 2,\n"
 "                \"option-data\": [\n"
 "                    {\n"
 "                        \"csv-format\": false,\n"
-"                        \"data\": \"FFFEFDFCFB\",\n"
-"                        \"name\": \"user-class\"\n"
+"                        \"data\": \"FF\",\n"
+"                        \"name\": \"default-ip-ttl\"\n"
 "                    }\n"
 "                ],\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:2::/80\"\n"
+"                        \"pool\": \"192.0.3.101 - 192.0.3.150\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:2::/64\"\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 25
+    // CONFIGURATION 32
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
-"                \"pd-pools\": [\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 64,\n"
 "                        \"option-data\": [\n"
 "                            {\n"
 "                                \"csv-format\": false,\n"
-"                                \"data\": \"112233445566\",\n"
-"                                \"name\": \"subscriber-id\"\n"
-"                            }\n"
-"                        ],\n"
-"                        \"prefix\": \"3000::\",\n"
-"                        \"prefix-len\": 48\n"
-"                    },\n"
-"                    {\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"option-data\": [\n"
+"                                \"data\": \"ABCDEF0105\",\n"
+"                                \"name\": \"dhcp-message\"\n"
+"                            },\n"
 "                            {\n"
 "                                \"csv-format\": false,\n"
-"                                \"data\": \"aabbccddee\",\n"
-"                                \"name\": \"user-class\"\n"
+"                                \"data\": \"01\",\n"
+"                                \"name\": \"default-ip-ttl\"\n"
 "                            }\n"
 "                        ],\n"
-"                        \"prefix\": \"3001::\",\n"
-"                        \"prefix-len\": 48\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"pools\": [\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            }\n"
+"        ],\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 33
+"{\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"id\": 1,\n"
+"                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [\n"
 "                            {\n"
 "                                \"csv-format\": false,\n"
-"                                \"data\": \"0102030405060708090A\",\n"
-"                                \"name\": \"subscriber-id\"\n"
+"                                \"data\": \"ABCDEF0105\",\n"
+"                                \"name\": \"dhcp-message\"\n"
 "                            }\n"
 "                        ],\n"
-"                        \"pool\": \"2001:db8:1::10 - 2001:db8:1::100\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    },\n"
 "                    {\n"
 "                        \"option-data\": [\n"
 "                            {\n"
 "                                \"csv-format\": false,\n"
-"                                \"data\": \"FFFEFDFCFB\",\n"
-"                                \"name\": \"user-class\"\n"
+"                                \"data\": \"01\",\n"
+"                                \"name\": \"default-ip-ttl\"\n"
 "                            }\n"
 "                        ],\n"
-"                        \"pool\": \"2001:db8:1::300 - 2001:db8:1::400\"\n"
+"                        \"pool\": \"192.0.2.200 - 192.0.2.250\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 26
+    // CONFIGURATION 34
+"{\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"option-data\": [\n"
+"            {\n"
+"                \"data\": \"true, 10.0.0.3, 127.0.0.1\",\n"
+"                \"name\": \"slp-directory-agent\"\n"
+"            },\n"
+"            {\n"
+"                \"data\": \"false, \",\n"
+"                \"name\": \"slp-service-scope\"\n"
+"            }\n"
+"        ],\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"id\": 1,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            }\n"
+"        ],\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 35
+"{\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"option-data\": [\n"
+"            {\n"
+"                \"data\": \"1234\",\n"
+"                \"name\": \"foo\",\n"
+"                \"space\": \"vendor-encapsulated-options-space\"\n"
+"            },\n"
+"            {\n"
+"                \"data\": \"192.168.2.1\",\n"
+"                \"name\": \"foo2\",\n"
+"                \"space\": \"vendor-encapsulated-options-space\"\n"
+"            }\n"
+"        ],\n"
+"        \"option-def\": [\n"
+"            {\n"
+"                \"code\": 1,\n"
+"                \"name\": \"foo\",\n"
+"                \"space\": \"vendor-encapsulated-options-space\",\n"
+"                \"type\": \"uint32\"\n"
+"            },\n"
+"            {\n"
+"                \"code\": 2,\n"
+"                \"name\": \"foo2\",\n"
+"                \"space\": \"vendor-encapsulated-options-space\",\n"
+"                \"type\": \"ipv4-address\"\n"
+"            }\n"
+"        ],\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 36
+"{\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"option-data\": [\n"
+"            {\n"
+"                \"csv-format\": false,\n"
+"                \"name\": \"vendor-encapsulated-options\"\n"
+"            },\n"
+"            {\n"
+"                \"data\": \"1234\",\n"
+"                \"name\": \"foo\",\n"
+"                \"space\": \"vendor-encapsulated-options-space\"\n"
+"            },\n"
+"            {\n"
+"                \"code\": 2,\n"
+"                \"csv-format\": true,\n"
+"                \"data\": \"192.168.2.1\",\n"
+"                \"name\": \"foo2\",\n"
+"                \"space\": \"vendor-encapsulated-options-space\"\n"
+"            }\n"
+"        ],\n"
+"        \"option-def\": [\n"
+"            {\n"
+"                \"code\": 1,\n"
+"                \"name\": \"foo\",\n"
+"                \"space\": \"vendor-encapsulated-options-space\",\n"
+"                \"type\": \"uint32\"\n"
+"            },\n"
+"            {\n"
+"                \"code\": 2,\n"
+"                \"name\": \"foo2\",\n"
+"                \"space\": \"vendor-encapsulated-options-space\",\n"
+"                \"type\": \"ipv4-address\"\n"
+"            }\n"
+"        ],\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"id\": 1,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            }\n"
+"        ],\n"
+"        \"valid-lifetime\": 3000\n"
+"    }\n",
+    // CONFIGURATION 37
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
@@ -878,23 +1134,22 @@ const char* EXTRACTED_CONFIGS[] = {
 "                \"space\": \"vendor-1234\"\n"
 "            }\n"
 "        ],\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.10\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 27
+    // CONFIGURATION 38
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
@@ -916,342 +1171,310 @@ const char* EXTRACTED_CONFIGS[] = {
 "                \"type\": \"string\"\n"
 "            }\n"
 "        ],\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 28
+    // CONFIGURATION 39
 "{\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"eth0\" ],\n"
+"            \"interfaces\": [ \"eth0\", \"eth1\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 29
+    // CONFIGURATION 40
 "{\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"eth0\", \"eth1\", \"*\" ],\n"
+"            \"interfaces\": [ \"eth0\", \"*\", \"eth1\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 30
+    // CONFIGURATION 41
+"{\n"
+"        \"dhcp-ddns\": {\n"
+"            \"enable-updates\": true,\n"
+"            \"max-queue-size\": 2048,\n"
+"            \"ncr-format\": \"JSON\",\n"
+"            \"ncr-protocol\": \"UDP\",\n"
+"            \"sender-ip\": \"192.168.2.2\",\n"
+"            \"sender-port\": 778,\n"
+"            \"server-ip\": \"192.168.2.1\",\n"
+"            \"server-port\": 777\n"
+"        },\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"id\": 1,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            }\n"
+"        ],\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 42
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
+"                \"rebind-timer\": 2,\n"
 "                \"relay\": {\n"
-"                    \"ip-addresses\": [ \"2001:db8:1::abcd\" ]\n"
+"                    \"ip-addresses\": [ \"192.0.2.123\" ]\n"
 "                },\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"renew-timer\": 1,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"valid-lifetime\": 4\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 31
+    // CONFIGURATION 43
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
+"                \"rebind-timer\": 2,\n"
 "                \"relay\": {\n"
-"                    \"ip-addresses\": [ \"2001:db9::abcd\", \"2001:db9::abce\" ]\n"
+"                    \"ip-addresses\": [ \"192.0.3.123\", \"192.0.3.124\" ]\n"
 "                },\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"renew-timer\": 1,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"valid-lifetime\": 4\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 32
+    // CONFIGURATION 44
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"client-class\": \"alpha\",\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"client-class\": \"beta\",\n"
 "                \"id\": 2,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:2::/80\"\n"
+"                        \"pool\": \"192.0.3.101 - 192.0.3.150\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:2::/64\"\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"client-class\": \"gamma\",\n"
 "                \"id\": 3,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:3::/80\"\n"
+"                        \"pool\": \"192.0.4.101 - 192.0.4.150\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:3::/64\"\n"
+"                \"subnet\": \"192.0.4.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 4,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:4::/80\"\n"
+"                        \"pool\": \"192.0.5.101 - 192.0.5.150\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:4::/64\"\n"
+"                \"subnet\": \"192.0.5.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 33
+    // CONFIGURATION 45
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"client-class\": \"alpha\",\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
-"                    },\n"
-"                    {\n"
-"                        \"client-class\": \"beta\",\n"
-"                        \"pool\": \"2001:db8:2::/80\"\n"
-"                    },\n"
-"                    {\n"
-"                        \"client-class\": \"gamma\",\n"
-"                        \"pool\": \"2001:db8:3::/80\"\n"
-"                    },\n"
-"                    {\n"
-"                        \"pool\": \"2001:db8:4::/80\"\n"
-"                    }\n"
-"                ],\n"
-"                \"subnet\": \"2001:db8:0::/40\"\n"
-"            }\n"
-"        ],\n"
-"        \"valid-lifetime\": 4000\n"
-"    }\n",
-    // CONFIGURATION 34
-"{\n"
-"        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"*\" ],\n"
-"            \"re-detect\": false\n"
-"        },\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
-"            {\n"
-"                \"id\": 1,\n"
-"                \"pd-pools\": [\n"
-"                    {\n"
-"                        \"client-class\": \"alpha\",\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"prefix\": \"2001:db8:1::\",\n"
-"                        \"prefix-len\": 48\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    },\n"
 "                    {\n"
 "                        \"client-class\": \"beta\",\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"prefix\": \"2001:db8:2::\",\n"
-"                        \"prefix-len\": 48\n"
+"                        \"pool\": \"192.0.3.101 - 192.0.3.150\"\n"
 "                    },\n"
 "                    {\n"
 "                        \"client-class\": \"gamma\",\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"prefix\": \"2001:db8:3::\",\n"
-"                        \"prefix-len\": 48\n"
+"                        \"pool\": \"192.0.4.101 - 192.0.4.150\"\n"
 "                    },\n"
 "                    {\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"prefix\": \"2001:db8:4::\",\n"
-"                        \"prefix-len\": 48\n"
-"                    }\n"
-"                ],\n"
-"                \"subnet\": \"2001:db8::/64\"\n"
-"            }\n"
-"        ],\n"
-"        \"valid-lifetime\": 4000\n"
-"    }\n",
-    // CONFIGURATION 35
-"{\n"
-"        \"dhcp-ddns\": {\n"
-"            \"enable-updates\": true,\n"
-"            \"max-queue-size\": 2048,\n"
-"            \"ncr-format\": \"JSON\",\n"
-"            \"ncr-protocol\": \"UDP\",\n"
-"            \"sender-ip\": \"3001::2\",\n"
-"            \"sender-port\": 778,\n"
-"            \"server-ip\": \"3001::1\",\n"
-"            \"server-port\": 777\n"
-"        },\n"
-"        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"*\" ],\n"
-"            \"re-detect\": false\n"
-"        },\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
-"            {\n"
-"                \"id\": 1,\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.5.101 - 192.0.5.150\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.0.0/16\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 36
+    // CONFIGURATION 46
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 123,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
 "                \"reservations\": [ ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 234,\n"
-"                \"pools\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.3.101 - 192.0.3.150\"\n"
+"                    }\n"
+"                ],\n"
 "                \"reservations\": [\n"
 "                    {\n"
 "                        \"duid\": \"01:02:03:04:05:06:07:08:09:0A\",\n"
 "                        \"hostname\": \"\",\n"
-"                        \"ip-addresses\": [ \"2001:db8:2::1234\" ],\n"
+"                        \"ip-address\": \"192.0.3.112\",\n"
 "                        \"option-data\": [\n"
 "                            {\n"
-"                                \"data\": \"2001:db8:2::1111\",\n"
-"                                \"name\": \"dns-servers\"\n"
+"                                \"data\": \"192.0.3.15\",\n"
+"                                \"name\": \"name-servers\"\n"
 "                            },\n"
 "                            {\n"
-"                                \"data\": \"11\",\n"
-"                                \"name\": \"preference\"\n"
+"                                \"data\": \"32\",\n"
+"                                \"name\": \"default-ip-ttl\"\n"
 "                            }\n"
 "                        ]\n"
 "                    },\n"
 "                    {\n"
 "                        \"hostname\": \"\",\n"
 "                        \"hw-address\": \"01:02:03:04:05:06\",\n"
-"                        \"ip-addresses\": [ \"2001:db8:2::abcd\" ],\n"
+"                        \"ip-address\": \"192.0.3.120\",\n"
 "                        \"option-data\": [\n"
 "                            {\n"
-"                                \"data\": \"2001:db8:2::abbc\",\n"
-"                                \"name\": \"dns-servers\"\n"
+"                                \"data\": \"192.0.3.95\",\n"
+"                                \"name\": \"name-servers\"\n"
 "                            },\n"
 "                            {\n"
-"                                \"data\": \"25\",\n"
-"                                \"name\": \"preference\"\n"
+"                                \"data\": \"11\",\n"
+"                                \"name\": \"default-ip-ttl\"\n"
 "                            }\n"
 "                        ]\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:2::/64\"\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 542,\n"
-"                \"pools\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.4.101 - 192.0.4.150\"\n"
+"                    }\n"
+"                ],\n"
 "                \"reservations\": [\n"
 "                    {\n"
 "                        \"duid\": \"0A:09:08:07:06:05:04:03:02:01\",\n"
 "                        \"hostname\": \"\",\n"
+"                        \"ip-address\": \"192.0.4.101\",\n"
 "                        \"option-data\": [\n"
 "                            {\n"
-"                                \"data\": \"2001:db8:3::3333\",\n"
-"                                \"name\": \"dns-servers\"\n"
+"                                \"data\": \"192.0.4.11\",\n"
+"                                \"name\": \"name-servers\"\n"
 "                            },\n"
 "                            {\n"
-"                                \"data\": \"33\",\n"
-"                                \"name\": \"preference\"\n"
+"                                \"data\": \"95\",\n"
+"                                \"name\": \"default-ip-ttl\"\n"
 "                            }\n"
-"                        ],\n"
-"                        \"prefixes\": [ \"2001:db8:3:2::/96\" ]\n"
+"                        ]\n"
 "                    },\n"
 "                    {\n"
+"                        \"circuit-id\": \"060504030201\",\n"
 "                        \"hostname\": \"\",\n"
-"                        \"hw-address\": \"06:05:04:03:02:01\",\n"
-"                        \"prefixes\": [ \"2001:db8:3:1::/96\" ]\n"
+"                        \"ip-address\": \"192.0.4.102\"\n"
+"                    },\n"
+"                    {\n"
+"                        \"client-id\": \"05:01:02:03:04:05:06\",\n"
+"                        \"hostname\": \"\",\n"
+"                        \"ip-address\": \"192.0.4.103\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:3::/64\"\n"
+"                \"subnet\": \"192.0.4.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 37
+    // CONFIGURATION 47
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
@@ -1265,218 +1488,179 @@ const char* EXTRACTED_CONFIGS[] = {
 "                \"type\": \"uint32\"\n"
 "            }\n"
 "        ],\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 234,\n"
-"                \"pools\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.3.101 - 192.0.3.150\"\n"
+"                    }\n"
+"                ],\n"
 "                \"reservations\": [\n"
 "                    {\n"
 "                        \"duid\": \"01:02:03:04:05:06:07:08:09:0A\",\n"
-"                        \"hostname\": \"\",\n"
-"                        \"ip-addresses\": [ \"2001:db8:2::1234\" ],\n"
+"                        \"ip-address\": \"192.0.3.112\",\n"
 "                        \"option-data\": [\n"
 "                            {\n"
-"                                \"data\": \"11\",\n"
+"                                \"data\": \"123\",\n"
 "                                \"name\": \"foo\",\n"
 "                                \"space\": \"isc\"\n"
 "                            }\n"
 "                        ]\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:2::/64\"\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 38
-"{\n"
-"        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"*\" ],\n"
-"            \"re-detect\": false\n"
-"        },\n"
-"        \"mac-sources\": [ \"rfc6939\", \"rfc4649\", \"rfc4580\" ],\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [ ],\n"
-"        \"valid-lifetime\": 4000\n"
-"    }\n",
-    // CONFIGURATION 39
+    // CONFIGURATION 48
 "{\n"
-"        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"*\" ],\n"
-"            \"re-detect\": false\n"
-"        },\n"
-"        \"mac-sources\": [ \"client-link-addr-option\", \"remote-id\", \"subscriber-id\" ],\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [ ],\n"
-"        \"valid-lifetime\": 4000\n"
-"    }\n",
-    // CONFIGURATION 40
-"{\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/64\"\n"
+"                        \"pool\": \"192.0.1.0/24\"\n"
 "                    }\n"
 "                ],\n"
 "                \"reservations-global\": false,\n"
 "                \"reservations-in-subnet\": true,\n"
 "                \"reservations-out-of-pool\": false,\n"
-"                \"subnet\": \"2001:db8:1::/48\"\n"
+"                \"subnet\": \"192.0.1.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 2,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:2::/64\"\n"
+"                        \"pool\": \"192.0.2.0/24\"\n"
 "                    }\n"
 "                ],\n"
 "                \"reservations-global\": false,\n"
 "                \"reservations-in-subnet\": true,\n"
 "                \"reservations-out-of-pool\": true,\n"
-"                \"subnet\": \"2001:db8:2::/48\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 3,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:3::/64\"\n"
+"                        \"pool\": \"192.0.3.0/24\"\n"
 "                    }\n"
 "                ],\n"
 "                \"reservations-global\": false,\n"
 "                \"reservations-in-subnet\": false,\n"
-"                \"subnet\": \"2001:db8:3::/48\"\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 4,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:4::/64\"\n"
+"                        \"pool\": \"192.0.4.0/24\"\n"
 "                    }\n"
 "                ],\n"
 "                \"reservations-global\": true,\n"
 "                \"reservations-in-subnet\": false,\n"
-"                \"subnet\": \"2001:db8:4::/48\"\n"
+"                \"subnet\": \"192.0.4.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 5,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:5::/64\"\n"
+"                        \"pool\": \"192.0.5.0/24\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:5::/48\"\n"
+"                \"subnet\": \"192.0.5.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 6,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:6::/64\"\n"
+"                        \"pool\": \"192.0.6.0/24\"\n"
 "                    }\n"
 "                ],\n"
 "                \"reservations-global\": true,\n"
 "                \"reservations-in-subnet\": true,\n"
 "                \"reservations-out-of-pool\": false,\n"
-"                \"subnet\": \"2001:db8:6::/48\"\n"
+"                \"subnet\": \"192.0.6.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 7,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:7::/64\"\n"
+"                        \"pool\": \"192.0.7.0/24\"\n"
 "                    }\n"
 "                ],\n"
 "                \"reservations-global\": true,\n"
 "                \"reservations-in-subnet\": true,\n"
 "                \"reservations-out-of-pool\": true,\n"
-"                \"subnet\": \"2001:db8:7::/48\"\n"
+"                \"subnet\": \"192.0.7.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 41
+    // CONFIGURATION 49
 "{\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-out-of-pool\": true,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/64\"\n"
+"                        \"pool\": \"192.0.2.0/24\"\n"
 "                    }\n"
 "                ],\n"
 "                \"reservations-global\": false,\n"
 "                \"reservations-in-subnet\": true,\n"
 "                \"reservations-out-of-pool\": false,\n"
-"                \"subnet\": \"2001:db8:1::/48\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 2,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:2::/64\"\n"
+"                        \"pool\": \"192.0.3.0/24\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:2::/48\"\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 42
-"{\n"
-"        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"*\" ],\n"
-"            \"re-detect\": false\n"
-"        },\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"dns-servers\", \"remote-id\" ],\n"
-"        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [ ],\n"
-"        \"valid-lifetime\": 4000\n"
-"    }\n",
-    // CONFIGURATION 43
+    // CONFIGURATION 50
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"subnet6\": [ ]\n"
+"        \"subnet4\": [ ]\n"
 "    }\n",
-    // CONFIGURATION 44
+    // CONFIGURATION 51
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"subnet6\": [ ]\n"
+"        \"subnet4\": [ ]\n"
 "    }\n",
-    // CONFIGURATION 45
+    // CONFIGURATION 52
 "{\n"
 "        \"decline-probation-period\": 12345,\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"subnet6\": [ ]\n"
+"        \"subnet4\": [ ]\n"
 "    }\n",
-    // CONFIGURATION 46
+    // CONFIGURATION 53
 "{\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 35,\n"
@@ -1490,222 +1674,306 @@ const char* EXTRACTED_CONFIGS[] = {
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"subnet6\": [ ]\n"
+"        \"subnet4\": [ ]\n"
 "    }\n",
-    // CONFIGURATION 47
+    // CONFIGURATION 54
 "{\n"
-"        \"client-classes\": [\n"
-"            {\n"
-"                \"name\": \"one\"\n"
-"            },\n"
-"            {\n"
-"                \"name\": \"two\"\n"
-"            },\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"subnet4\": [\n"
 "            {\n"
-"                \"name\": \"three\"\n"
+"                \"id\": 1,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 55
+"{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-subnet\": \"2001:db8::123/45\",\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 48
+    // CONFIGURATION 56
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"ethX\",\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8::/64\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8::/32\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 49
+    // CONFIGURATION 57
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"ethX\",\n"
+"                \"4o6-subnet\": \"2001:db8::543/21\",\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8::/64\",\n"
-"                        \"user-context\": { }\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8::/32\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 50
+    // CONFIGURATION 58
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface-id\": \"vlan123\",\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8::/64\",\n"
-"                        \"user-context\": {\n"
-"                            \"lw4over6-bind-prefix-len\": 56,\n"
-"                            \"lw4over6-sharing-ratio\": 64,\n"
-"                            \"lw4over6-sysports-exclude\": true,\n"
-"                            \"lw4over6-v4-pool\": \"192.0.2.0/24\"\n"
-"                        }\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8::/32\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 51
+    // CONFIGURATION 59
 "{\n"
+"        \"client-classes\": [\n"
+"            {\n"
+"                \"name\": \"one\"\n"
+"            },\n"
+"            {\n"
+"                \"name\": \"two\"\n"
+"            },\n"
+"            {\n"
+"                \"name\": \"three\"\n"
+"            }\n"
+"        ],\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:: - 2001:db8::ffff:ffff:ffff:ffff\",\n"
-"                        \"user-context\": {\n"
-"                            \"lw4over6-bind-prefix-len\": 56,\n"
-"                            \"lw4over6-sharing-ratio\": 64,\n"
-"                            \"lw4over6-sysports-exclude\": true,\n"
-"                            \"lw4over6-v4-pool\": \"192.0.2.0/24\"\n"
-"                        }\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8::/32\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 52
+    // CONFIGURATION 60
+"{\n"
+"        \"client-classes\": [\n"
+"            {\n"
+"                \"max-valid-lifetime\": 3000,\n"
+"                \"min-valid-lifetime\": 1000,\n"
+"                \"name\": \"one\",\n"
+"                \"valid-lifetime\": 2000\n"
+"            },\n"
+"            {\n"
+"                \"name\": \"two\"\n"
+"            }\n"
+"        ],\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"id\": 1,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            }\n"
+"        ]\n"
+"    }\n",
+    // CONFIGURATION 61
+"{\n"
+"        \"client-classes\": [\n"
+"            {\n"
+"                \"max-valid-lifetime\": 3000,\n"
+"                \"min-valid-lifetime\": 1000,\n"
+"                \"name\": \"one\",\n"
+"                \"template-test\": \"''\",\n"
+"                \"valid-lifetime\": 2000\n"
+"            },\n"
+"            {\n"
+"                \"name\": \"two\",\n"
+"                \"template-test\": \"''\"\n"
+"            }\n"
+"        ],\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"id\": 1,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            }\n"
+"        ]\n"
+"    }\n",
+    // CONFIGURATION 62
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
-"                \"pd-pools\": [\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"prefix\": \"2001:db8::\",\n"
-"                        \"prefix-len\": 56\n"
+"                        \"pool\": \"192.0.2.0/28\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8::/32\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 53
+    // CONFIGURATION 63
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
-"                \"pd-pools\": [\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"prefix\": \"2001:db8::\",\n"
-"                        \"prefix-len\": 56,\n"
+"                        \"pool\": \"192.0.2.0/28\",\n"
 "                        \"user-context\": { }\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8::/32\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 54
+    // CONFIGURATION 64
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
-"                \"pd-pools\": [\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"prefix\": \"2001:db8::\",\n"
-"                        \"prefix-len\": 56,\n"
+"                        \"pool\": \"192.0.2.0/28\",\n"
 "                        \"user-context\": {\n"
-"                            \"lw4over6-bind-prefix-len\": 56,\n"
-"                            \"lw4over6-sharing-ratio\": 64,\n"
-"                            \"lw4over6-sysports-exclude\": true,\n"
-"                            \"lw4over6-v4-pool\": \"192.0.2.0/24\"\n"
+"                            \"bool-param\": true,\n"
+"                            \"integer-param\": 42,\n"
+"                            \"string-param\": \"Sagittarius\"\n"
 "                        }\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8::/32\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 55
+    // CONFIGURATION 65
+"{\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"id\": 1,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.2.0 - 192.0.2.15\",\n"
+"                        \"user-context\": {\n"
+"                            \"bool-param\": true,\n"
+"                            \"integer-param\": 42,\n"
+"                            \"string-param\": \"Sagittarius\"\n"
+"                        }\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            }\n"
+"        ],\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 66
 "{\n"
 "        \"hosts-databases\": [\n"
 "            {\n"
@@ -1725,12 +1993,11 @@ const char* EXTRACTED_CONFIGS[] = {
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 56
+    // CONFIGURATION 67
 "{\n"
 "        \"client-classes\": [\n"
 "            {\n"
@@ -1753,7 +2020,7 @@ const char* EXTRACTED_CONFIGS[] = {
 "        ],\n"
 "        \"control-sockets\": [\n"
 "            {\n"
-"                \"socket-name\": \"/tmp/kea6-ctrl-socket\",\n"
+"                \"socket-name\": \"/tmp/kea4-ctrl-socket\",\n"
 "                \"socket-type\": \"unix\",\n"
 "                \"user-context\": {\n"
 "                    \"comment\": \"Indirect comment\"\n"
@@ -1775,7 +2042,7 @@ const char* EXTRACTED_CONFIGS[] = {
 "                        \"comment\": \"basic HTTP authentication\"\n"
 "                    }\n"
 "                },\n"
-"                \"socket-address\": \"127.0.0.1\",\n"
+"                \"socket-address\": \"::1\",\n"
 "                \"socket-port\": 8000,\n"
 "                \"socket-type\": \"http\",\n"
 "                \"user-context\": {\n"
@@ -1800,7 +2067,7 @@ const char* EXTRACTED_CONFIGS[] = {
 "            {\n"
 "                \"csv-format\": false,\n"
 "                \"data\": \"ABCDEF0105\",\n"
-"                \"name\": \"subscriber-id\",\n"
+"                \"name\": \"dhcp-message\",\n"
 "                \"user-context\": {\n"
 "                    \"comment\": \"Set option value\"\n"
 "                }\n"
@@ -1811,37 +2078,21 @@ const char* EXTRACTED_CONFIGS[] = {
 "                \"code\": 100,\n"
 "                \"name\": \"foo\",\n"
 "                \"space\": \"isc\",\n"
-"                \"type\": \"ipv6-address\",\n"
+"                \"type\": \"ipv4-address\",\n"
 "                \"user-context\": {\n"
 "                    \"comment\": \"An option definition\"\n"
 "                }\n"
 "            }\n"
 "        ],\n"
-"        \"server-id\": {\n"
-"            \"type\": \"LL\",\n"
-"            \"user-context\": {\n"
-"                \"comment\": \"DHCPv6 specific\"\n"
-"            }\n"
-"        },\n"
 "        \"shared-networks\": [\n"
 "            {\n"
 "                \"name\": \"foo\",\n"
-"                \"subnet6\": [\n"
+"                \"subnet4\": [\n"
 "                    {\n"
 "                        \"id\": 100,\n"
-"                        \"pd-pools\": [\n"
-"                            {\n"
-"                                \"delegated-len\": 64,\n"
-"                                \"prefix\": \"2001:db2::\",\n"
-"                                \"prefix-len\": 48,\n"
-"                                \"user-context\": {\n"
-"                                    \"comment\": \"A prefix pool\"\n"
-"                                }\n"
-"                            }\n"
-"                        ],\n"
 "                        \"pools\": [\n"
 "                            {\n"
-"                                \"pool\": \"2001:db1::/64\",\n"
+"                                \"pool\": \"192.0.1.1-192.0.1.10\",\n"
 "                                \"user-context\": {\n"
 "                                    \"comment\": \"A pool\"\n"
 "                                }\n"
@@ -1854,7 +2105,7 @@ const char* EXTRACTED_CONFIGS[] = {
 "                                \"option-data\": [\n"
 "                                    {\n"
 "                                        \"data\": \"example.com\",\n"
-"                                        \"name\": \"domain-search\",\n"
+"                                        \"name\": \"domain-name\",\n"
 "                                        \"user-context\": {\n"
 "                                            \"comment\": \"An option in a reservation\"\n"
 "                                        }\n"
@@ -1865,7 +2116,7 @@ const char* EXTRACTED_CONFIGS[] = {
 "                                }\n"
 "                            }\n"
 "                        ],\n"
-"                        \"subnet\": \"2001:db1::/48\",\n"
+"                        \"subnet\": \"192.0.1.0/24\",\n"
 "                        \"user-context\": {\n"
 "                            \"comment\": \"A subnet\"\n"
 "                        }\n"
@@ -1877,175 +2128,219 @@ const char* EXTRACTED_CONFIGS[] = {
 "            }\n"
 "        ],\n"
 "        \"user-context\": {\n"
-"            \"comment\": \"A DHCPv6 server\"\n"
+"            \"comment\": \"A DHCPv4 server\"\n"
 "        }\n"
 "    }\n",
-    // CONFIGURATION 57
+    // CONFIGURATION 68
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations\": [\n"
 "            {\n"
 "                \"duid\": \"01:02:03:04:05:06:07:08:09:0A\",\n"
-"                \"hostname\": \"\",\n"
-"                \"ip-addresses\": [ \"2001:db8:2::1234\" ],\n"
+"                \"hostname\": \"global1\",\n"
+"                \"ip-address\": \"192.0.200.1\",\n"
 "                \"option-data\": [\n"
 "                    {\n"
-"                        \"data\": \"2001:db8:2::1111\",\n"
-"                        \"name\": \"dns-servers\"\n"
+"                        \"data\": \"192.0.3.15\",\n"
+"                        \"name\": \"name-servers\"\n"
 "                    },\n"
 "                    {\n"
-"                        \"data\": \"11\",\n"
-"                        \"name\": \"preference\"\n"
+"                        \"data\": \"32\",\n"
+"                        \"name\": \"default-ip-ttl\"\n"
 "                    }\n"
 "                ]\n"
 "            },\n"
 "            {\n"
-"                \"hostname\": \"\",\n"
+"                \"hostname\": \"global2\",\n"
 "                \"hw-address\": \"01:02:03:04:05:06\",\n"
-"                \"ip-addresses\": [ \"2001:db8:2::abcd\" ],\n"
 "                \"option-data\": [\n"
 "                    {\n"
-"                        \"data\": \"2001:db8:2::abbc\",\n"
-"                        \"name\": \"dns-servers\"\n"
+"                        \"data\": \"192.0.3.95\",\n"
+"                        \"name\": \"name-servers\"\n"
 "                    },\n"
 "                    {\n"
-"                        \"data\": \"25\",\n"
-"                        \"name\": \"preference\"\n"
+"                        \"data\": \"11\",\n"
+"                        \"name\": \"default-ip-ttl\"\n"
 "                    }\n"
 "                ]\n"
 "            }\n"
 "        ],\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 123,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
 "                \"reservations\": [ ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
-"            },\n"
-"            {\n"
-"                \"id\": 234,\n"
-"                \"pools\": [ ],\n"
-"                \"subnet\": \"2001:db8:2::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 542,\n"
-"                \"pools\": [ ],\n"
-"                \"subnet\": \"2001:db8:3::/64\"\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.4.101 - 192.0.4.150\"\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.4.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 58
+    // CONFIGURATION 69
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"renew-timer\": 1000,\n"
-"        \"statistic-default-sample-age\": 5,\n"
-"        \"statistic-default-sample-count\": 10,\n"
+"        \"shared-networks\": [\n"
+"            {\n"
+"                \"calculate-tee-times\": true,\n"
+"                \"name\": \"foo\",\n"
+"                \"subnet4\": [\n"
+"                    {\n"
+"                        \"calculate-tee-times\": false,\n"
+"                        \"id\": 100,\n"
+"                        \"pools\": [\n"
+"                            {\n"
+"                                \"pool\": \"192.0.1.1-192.0.1.10\"\n"
+"                            }\n"
+"                        ],\n"
+"                        \"subnet\": \"192.0.1.0/24\",\n"
+"                        \"t1-percent\": 0.45,\n"
+"                        \"t2-percent\": 0.65\n"
+"                    },\n"
+"                    {\n"
+"                        \"id\": 200,\n"
+"                        \"pools\": [\n"
+"                            {\n"
+"                                \"pool\": \"192.0.2.1-192.0.2.10\"\n"
+"                            }\n"
+"                        ],\n"
+"                        \"subnet\": \"192.0.2.0/24\"\n"
+"                    }\n"
+"                ],\n"
+"                \"t1-percent\": 0.4,\n"
+"                \"t2-percent\": 0.75\n"
+"            }\n"
+"        ],\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"id\": 300,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.3.0 - 192.0.3.15\"\n"
+"                    }\n"
+"                ],\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
+"            }\n"
+"        ],\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 59
-"{\n"
-"        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"*\" ],\n"
-"            \"re-detect\": false\n"
-"        },\n"
-"        \"subnet6\": [ ]\n"
-"    }\n",
-    // CONFIGURATION 60
+    // CONFIGURATION 70
 "{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"multi-threading\": {\n"
-"            \"enable-multi-threading\": true,\n"
-"            \"packet-queue-size\": 1024,\n"
-"            \"thread-pool-size\": 48\n"
-"        },\n"
-"        \"subnet6\": [ ]\n"
-"    }\n",
-    // CONFIGURATION 61
-"{\n"
-"        \"client-classes\": [\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"subnet4\": [\n"
 "            {\n"
-"                \"max-preferred-lifetime\": 6000,\n"
-"                \"max-valid-lifetime\": 3000,\n"
-"                \"min-preferred-lifetime\": 4000,\n"
-"                \"min-valid-lifetime\": 1000,\n"
-"                \"name\": \"one\",\n"
-"                \"preferred-lifetime\": 5000,\n"
-"                \"valid-lifetime\": 2000\n"
+"                \"id\": 1,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"store-extended-info\": true,\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            },\n"
 "            {\n"
-"                \"name\": \"two\"\n"
+"                \"id\": 2,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.3.1 - 192.0.3.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            }\n"
 "        ],\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 71
+"{\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"subnet6\": [\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"store-extended-info\": true,\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
+"            },\n"
+"            {\n"
+"                \"id\": 2,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"pool\": \"192.0.3.1 - 192.0.3.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            }\n"
-"        ]\n"
+"        ],\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 62
+    // CONFIGURATION 72
 "{\n"
-"        \"client-classes\": [\n"
-"            {\n"
-"                \"max-preferred-lifetime\": 6000,\n"
-"                \"max-valid-lifetime\": 3000,\n"
-"                \"min-preferred-lifetime\": 4000,\n"
-"                \"min-valid-lifetime\": 1000,\n"
-"                \"name\": \"one\",\n"
-"                \"preferred-lifetime\": 5000,\n"
-"                \"template-test\": \"''\",\n"
-"                \"valid-lifetime\": 2000\n"
-"            },\n"
-"            {\n"
-"                \"name\": \"two\",\n"
-"                \"template-test\": \"''\"\n"
-"            }\n"
-"        ],\n"
 "        \"interfaces-config\": {\n"
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"subnet6\": [\n"
-"            {\n"
-"                \"id\": 1,\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n"
-"                    }\n"
-"                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
-"            }\n"
-"        ]\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"statistic-default-sample-age\": 5,\n"
+"        \"statistic-default-sample-count\": 10,\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 63
+    // CONFIGURATION 73
+"{\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"subnet4\": [ ]\n"
+"    }\n",
+    // CONFIGURATION 74
+"{\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": true,\n"
+"            \"packet-queue-size\": 1024,\n"
+"            \"thread-pool-size\": 48\n"
+"        },\n"
+"        \"subnet4\": [ ]\n"
+"    }\n",
+    // CONFIGURATION 75
 "{\n"
 "        \"ddns-conflict-resolution-mode\": \"no-check-with-dhcid\",\n"
 "        \"interfaces-config\": {\n"
@@ -2054,55 +2349,55 @@ const char* EXTRACTED_CONFIGS[] = {
 "        },\n"
 "        \"rebind-timer\": 2000,\n"
 "        \"renew-timer\": 1000,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
 "                \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "                \"id\": 1,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:1::1 - 2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1 - 192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:1::/64\"\n"
+"                \"subnet\": \"192.0.2.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"ddns-conflict-resolution-mode\": \"check-exists-with-dhcid\",\n"
 "                \"id\": 2,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:2::1 - 2001:db8:2::ffff\"\n"
+"                        \"pool\": \"192.0.3.1 - 192.0.3.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:2::/64\"\n"
+"                \"subnet\": \"192.0.3.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"ddns-conflict-resolution-mode\": \"no-check-without-dhcid\",\n"
 "                \"id\": 3,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:3::1 - 2001:db8:3::ffff\"\n"
+"                        \"pool\": \"192.0.4.1 - 192.0.4.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:3::/64\"\n"
+"                \"subnet\": \"192.0.4.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"ddns-conflict-resolution-mode\": \"no-check-with-dhcid\",\n"
 "                \"id\": 4,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:4::1 - 2001:db8:4::ffff\"\n"
+"                        \"pool\": \"192.0.5.1 - 192.0.5.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:4::/64\"\n"
+"                \"subnet\": \"192.0.5.0/24\"\n"
 "            },\n"
 "            {\n"
 "                \"id\": 5,\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"pool\": \"2001:db8:5::1 - 2001:db8:5::ffff\"\n"
+"                        \"pool\": \"192.0.6.1 - 192.0.6.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"subnet\": \"2001:db8:5::/64\"\n"
+"                \"subnet\": \"192.0.6.0/24\"\n"
 "            }\n"
 "        ],\n"
 "        \"valid-lifetime\": 4000\n"
@@ -2114,7 +2409,9 @@ const char* UNPARSED_CONFIGS[] = {
     // CONFIGURATION 0
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -2137,10 +2434,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -2150,7 +2448,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -2161,19 +2459,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -2183,28 +2479,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 1
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -2227,10 +2519,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -2240,7 +2533,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -2251,24 +2544,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
-"        \"max-preferred-lifetime\": 4000,\n"
-"        \"max-valid-lifetime\": 5000,\n"
-"        \"min-preferred-lifetime\": 2000,\n"
-"        \"min-valid-lifetime\": 3000,\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
-"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -2277,60 +2563,52 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 4000,\n"
-"                \"max-valid-lifetime\": 5000,\n"
-"                \"min-preferred-lifetime\": 2000,\n"
-"                \"min-valid-lifetime\": 3000,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::1-2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
 "                },\n"
-"                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
     // CONFIGURATION 2
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -2353,10 +2631,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -2366,7 +2645,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -2377,19 +2656,16 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -2399,132 +2675,145 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:3::/80\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:3::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            },\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 34,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:4::/80\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:4::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            },\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 100,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:2::/80\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
 "                },\n"
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:2::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
-"            },\n"
+"            }\n"
+"        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 3
+"{\n"
+"        \"allocator\": \"iterative\",\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
+"        \"ddns-generated-prefix\": \"myhost\",\n"
+"        \"ddns-override-client-update\": false,\n"
+"        \"ddns-override-no-update\": false,\n"
+"        \"ddns-qualifying-suffix\": \"\",\n"
+"        \"ddns-replace-client-name\": \"never\",\n"
+"        \"ddns-send-updates\": true,\n"
+"        \"ddns-update-on-renew\": false,\n"
+"        \"decline-probation-period\": 86400,\n"
+"        \"dhcp-ddns\": {\n"
+"            \"enable-updates\": false,\n"
+"            \"max-queue-size\": 1024,\n"
+"            \"ncr-format\": \"JSON\",\n"
+"            \"ncr-protocol\": \"UDP\",\n"
+"            \"sender-ip\": \"0.0.0.0\",\n"
+"            \"sender-port\": 0,\n"
+"            \"server-ip\": \"127.0.0.1\",\n"
+"            \"server-port\": 53001\n"
+"        },\n"
+"        \"dhcp-queue-control\": {\n"
+"            \"capacity\": 64,\n"
+"            \"enable-queue\": false,\n"
+"            \"queue-type\": \"kea-ring4\"\n"
+"        },\n"
+"        \"dhcp4o6-port\": 0,\n"
+"        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
+"        \"expired-leases-processing\": {\n"
+"            \"flush-reclaimed-timer-wait-time\": 25,\n"
+"            \"hold-reclaimed-time\": 3600,\n"
+"            \"max-reclaim-leases\": 100,\n"
+"            \"max-reclaim-time\": 250,\n"
+"            \"reclaim-timer-wait-time\": 10,\n"
+"            \"unwarned-reclaim-cycles\": 5\n"
+"        },\n"
+"        \"hooks-libraries\": [ ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
+"        \"hostname-char-replacement\": \"\",\n"
+"        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"ip-reservations-unique\": true,\n"
+"        \"lease-database\": {\n"
+"            \"type\": \"memfile\"\n"
+"        },\n"
+"        \"match-client-id\": true,\n"
+"        \"max-valid-lifetime\": 5000,\n"
+"        \"min-valid-lifetime\": 3000,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": true,\n"
+"            \"packet-queue-size\": 64,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
+"        \"option-def\": [ ],\n"
+"        \"parked-packet-limit\": 256,\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"reservations-global\": false,\n"
+"        \"reservations-in-subnet\": true,\n"
+"        \"reservations-lookup-first\": false,\n"
+"        \"reservations-out-of-pool\": false,\n"
+"        \"sanity-checks\": {\n"
+"            \"extended-info-checks\": \"fix\",\n"
+"            \"lease-checks\": \"warn\"\n"
+"        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
+"        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
+"        \"statistic-default-sample-age\": 0,\n"
+"        \"statistic-default-sample-count\": 20,\n"
+"        \"store-extended-info\": false,\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 1024,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 5000,\n"
+"                \"min-valid-lifetime\": 3000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -2532,20 +2821,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 3
+    // CONFIGURATION 4
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -2568,10 +2859,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -2581,7 +2873,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -2592,19 +2884,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -2614,39 +2904,30 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.4.101-192.0.4.150\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -2654,30 +2935,27 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.4.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            },\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 2,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 34,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:2::/80\"\n"
+"                        \"pool\": \"192.0.5.101-192.0.5.150\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -2685,30 +2963,27 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:2::/64\",\n"
+"                \"subnet\": \"192.0.5.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            },\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 3,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 100,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:3::/80\"\n"
+"                        \"pool\": \"192.0.3.101-192.0.3.150\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -2716,30 +2991,27 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:3::/64\",\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            },\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 4,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1024,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:4::/80\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -2747,23 +3019,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:4::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 4
+    // CONFIGURATION 5
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
-"        \"compatibility\": {\n"
-"            \"lenient-option-parsing\": true\n"
-"        },\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"bar\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -2786,10 +3057,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -2799,7 +3071,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -2810,19 +3082,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"1.2.3.4\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -2832,39 +3102,30 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"foo\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::1-2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -2872,20 +3133,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 5
+    // CONFIGURATION 6
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -2908,10 +3171,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -2921,7 +3185,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -2932,23 +3196,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
-"        \"max-preferred-lifetime\": 4000,\n"
-"        \"max-valid-lifetime\": 5000,\n"
-"        \"min-preferred-lifetime\": 2000,\n"
-"        \"min-valid-lifetime\": 3000,\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -2958,60 +3216,56 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"boot-file-name\": \"bar\",\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 4,\n"
-"                \"max-valid-lifetime\": 5,\n"
-"                \"min-preferred-lifetime\": 2,\n"
-"                \"min-valid-lifetime\": 3,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"next-server\": \"1.2.3.4\",\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::1-2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2,\n"
+"                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
 "                },\n"
-"                \"renew-timer\": 1,\n"
+"                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
+"                \"server-hostname\": \"foo\",\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 6
+    // CONFIGURATION 7
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"nofile\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -3034,10 +3288,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -3047,7 +3302,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -3058,19 +3313,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"192.0.0.1\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -3080,61 +3333,56 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"nohost\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"boot-file-name\": \"bootfile.efi\",\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"interface\": \"eth0\",\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
+"                \"next-server\": \"1.2.3.4\",\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::1-2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
 "                },\n"
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
+"                \"server-hostname\": \"some-name.example.org\",\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 7
+    // CONFIGURATION 8
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -3157,10 +3405,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": false,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -3170,30 +3419,28 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ ],\n"
+"            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -3203,40 +3450,30 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"interface-id\": \"foobar\",\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::1-2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -3244,20 +3481,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 8
+    // CONFIGURATION 9
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -3280,10 +3519,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -3293,7 +3533,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -3304,19 +3544,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -3326,43 +3564,30 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/96\"\n"
-"                    },\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1:0:abcd::/112\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -3370,55 +3595,28 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            },\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 2,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:2::1-2001:db8:2::ff\"\n"
-"                    },\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:2::300/120\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:2::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 9
+    // CONFIGURATION 10
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"compatibility\": {\n"
+"            \"exclude-first-last-24\": true,\n"
+"            \"ignore-dhcp-server-identifier\": true,\n"
+"            \"ignore-rai-link-selection\": true,\n"
+"            \"lenient-option-parsing\": true\n"
+"        },\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -3441,10 +3639,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -3454,7 +3653,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -3465,19 +3664,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -3487,39 +3684,30 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -3527,20 +3715,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 10
+    // CONFIGURATION 11
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -3563,10 +3753,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -3576,7 +3767,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -3587,19 +3778,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -3609,41 +3798,60 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
+"                \"match-client-id\": true,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 2,\n"
+"                \"match-client-id\": false,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 128,\n"
 "                        \"option-data\": [ ],\n"
-"                        \"prefix\": \"2001:db8:1::\",\n"
-"                        \"prefix-len\": 64\n"
+"                        \"pool\": \"192.0.3.1-192.0.3.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"pools\": [ ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -3651,20 +3859,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 7200\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 11
+    // CONFIGURATION 12
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -3687,10 +3897,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -3700,7 +3911,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -3711,19 +3922,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -3733,43 +3942,59 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
+"                \"match-client-id\": false,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 2,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"excluded-prefix\": \"3000::1000:0:0:0\",\n"
-"                        \"excluded-prefix-len\": 72,\n"
 "                        \"option-data\": [ ],\n"
-"                        \"prefix\": \"3000::\",\n"
-"                        \"prefix-len\": 48\n"
+"                        \"pool\": \"192.0.3.1-192.0.3.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"pools\": [ ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -3777,20 +4002,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 7200\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 12
+    // CONFIGURATION 13
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -3813,10 +4040,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -3826,7 +4054,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -3837,19 +4065,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -3859,58 +4085,60 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"authoritative\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [\n"
-"                    {\n"
-"                        \"delegated-len\": 80,\n"
-"                        \"option-data\": [ ],\n"
-"                        \"prefix\": \"2001:db8:1:1::\",\n"
-"                        \"prefix-len\": 72\n"
-"                    },\n"
-"                    {\n"
-"                        \"delegated-len\": 88,\n"
-"                        \"option-data\": [ ],\n"
-"                        \"prefix\": \"2001:db8:1:2::\",\n"
-"                        \"prefix-len\": 72\n"
-"                    },\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 96,\n"
 "                        \"option-data\": [ ],\n"
-"                        \"prefix\": \"3000:1:3::\",\n"
-"                        \"prefix-len\": 72\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"authoritative\": false,\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 2,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1:4::/80\"\n"
+"                        \"pool\": \"192.0.3.1-192.0.3.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -3918,20 +4146,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/40\",\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 7200\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 13
+    // CONFIGURATION 14
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": true,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -3954,10 +4184,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -3967,7 +4198,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -3978,19 +4209,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -4000,41 +4229,59 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"authoritative\": false,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 2,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 64,\n"
 "                        \"option-data\": [ ],\n"
-"                        \"prefix\": \"2001:db8:1::\",\n"
-"                        \"prefix-len\": 64\n"
+"                        \"pool\": \"192.0.3.1-192.0.3.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"pools\": [ ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -4042,20 +4289,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 7200\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 14
+    // CONFIGURATION 15
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -4078,10 +4327,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -4091,38 +4341,31 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ ],\n"
+"            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
+"        \"max-valid-lifetime\": 5000,\n"
+"        \"min-valid-lifetime\": 3000,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
-"        \"option-def\": [\n"
-"            {\n"
-"                \"array\": false,\n"
-"                \"code\": 100,\n"
-"                \"encapsulate\": \"\",\n"
-"                \"name\": \"foo\",\n"
-"                \"record-types\": \"\",\n"
-"                \"space\": \"isc\",\n"
-"                \"type\": \"ipv6-address\"\n"
-"            }\n"
-"        ],\n"
+"        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -4131,28 +4374,53 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 5,\n"
+"                \"min-valid-lifetime\": 3,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4\n"
+"            }\n"
+"        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 7200\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 15
+    // CONFIGURATION 16
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -4175,10 +4443,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -4188,38 +4457,29 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ ],\n"
+"            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
-"        \"option-def\": [\n"
-"            {\n"
-"                \"array\": false,\n"
-"                \"code\": 100,\n"
-"                \"encapsulate\": \"\",\n"
-"                \"name\": \"foo\",\n"
-"                \"record-types\": \"uint16, ipv4-address, ipv6-address, string\",\n"
-"                \"space\": \"isc\",\n"
-"                \"type\": \"record\"\n"
-"            }\n"
-"        ],\n"
+"        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -4228,28 +4488,89 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.0/28\"\n"
+"                    },\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.200-192.0.2.255\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 2,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.3.0/25\"\n"
+"                    },\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.3.128/25\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 7200\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 16
+    // CONFIGURATION 17
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -4272,10 +4593,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -4285,47 +4607,29 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ ],\n"
+"            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
-"        \"option-def\": [\n"
-"            {\n"
-"                \"array\": false,\n"
-"                \"code\": 100,\n"
-"                \"encapsulate\": \"\",\n"
-"                \"name\": \"foo\",\n"
-"                \"record-types\": \"\",\n"
-"                \"space\": \"isc\",\n"
-"                \"type\": \"uint32\"\n"
-"            },\n"
-"            {\n"
-"                \"array\": false,\n"
-"                \"code\": 101,\n"
-"                \"encapsulate\": \"\",\n"
-"                \"name\": \"foo-2\",\n"
-"                \"record-types\": \"\",\n"
-"                \"space\": \"isc\",\n"
-"                \"type\": \"ipv4-address\"\n"
-"            }\n"
-"        ],\n"
+"        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -4334,28 +4638,53 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.128/28\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 7200\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 17
+    // CONFIGURATION 18
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -4378,10 +4707,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -4391,7 +4721,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -4402,27 +4732,26 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
-"                \"array\": true,\n"
+"                \"array\": false,\n"
 "                \"code\": 100,\n"
 "                \"encapsulate\": \"\",\n"
 "                \"name\": \"foo\",\n"
 "                \"record-types\": \"\",\n"
 "                \"space\": \"isc\",\n"
-"                \"type\": \"uint32\"\n"
+"                \"type\": \"ipv4-address\"\n"
 "            }\n"
 "        ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -4431,28 +4760,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 18
+    // CONFIGURATION 19
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -4475,10 +4800,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -4488,7 +4814,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -4499,27 +4825,26 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
 "                \"array\": false,\n"
 "                \"code\": 100,\n"
-"                \"encapsulate\": \"sub-opts-space\",\n"
+"                \"encapsulate\": \"\",\n"
 "                \"name\": \"foo\",\n"
-"                \"record-types\": \"\",\n"
+"                \"record-types\": \"uint16, ipv4-address, ipv6-address, string\",\n"
 "                \"space\": \"isc\",\n"
-"                \"type\": \"uint32\"\n"
+"                \"type\": \"record\"\n"
 "            }\n"
 "        ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -4528,28 +4853,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 19
+    // CONFIGURATION 20
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -4572,10 +4893,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -4585,50 +4907,46 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"*\" ],\n"
+"            \"interfaces\": [ ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
-"        \"option-data\": [\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
+"        \"option-def\": [\n"
 "            {\n"
-"                \"always-send\": false,\n"
-"                \"code\": 38,\n"
-"                \"csv-format\": false,\n"
-"                \"data\": \"ABCDEF0105\",\n"
-"                \"name\": \"subscriber-id\",\n"
-"                \"never-send\": false,\n"
-"                \"space\": \"dhcp6\"\n"
+"                \"array\": false,\n"
+"                \"code\": 100,\n"
+"                \"encapsulate\": \"\",\n"
+"                \"name\": \"foo\",\n"
+"                \"record-types\": \"\",\n"
+"                \"space\": \"isc\",\n"
+"                \"type\": \"uint32\"\n"
 "            },\n"
 "            {\n"
-"                \"always-send\": false,\n"
-"                \"code\": 7,\n"
-"                \"csv-format\": true,\n"
-"                \"data\": \"01\",\n"
-"                \"name\": \"preference\",\n"
-"                \"never-send\": false,\n"
-"                \"space\": \"dhcp6\"\n"
+"                \"array\": false,\n"
+"                \"code\": 101,\n"
+"                \"encapsulate\": \"\",\n"
+"                \"name\": \"foo-2\",\n"
+"                \"record-types\": \"\",\n"
+"                \"space\": \"isc\",\n"
+"                \"type\": \"ipv4-address\"\n"
 "            }\n"
 "        ],\n"
-"        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
-"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -4637,60 +4955,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            }\n"
-"        ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 20
+    // CONFIGURATION 21
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -4713,10 +4995,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -4726,31 +5009,37 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"*\" ],\n"
+"            \"interfaces\": [ ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
-"        \"option-def\": [ ],\n"
+"        \"option-def\": [\n"
+"            {\n"
+"                \"array\": true,\n"
+"                \"code\": 100,\n"
+"                \"encapsulate\": \"\",\n"
+"                \"name\": \"foo\",\n"
+"                \"record-types\": \"\",\n"
+"                \"space\": \"isc\",\n"
+"                \"type\": \"uint32\"\n"
+"            }\n"
+"        ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
-"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -4759,79 +5048,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [\n"
-"                    {\n"
-"                        \"always-send\": false,\n"
-"                        \"code\": 38,\n"
-"                        \"csv-format\": false,\n"
-"                        \"data\": \"ABCDEF0105\",\n"
-"                        \"name\": \"subscriber-id\",\n"
-"                        \"never-send\": false,\n"
-"                        \"space\": \"dhcp6\"\n"
-"                    },\n"
-"                    {\n"
-"                        \"always-send\": false,\n"
-"                        \"code\": 7,\n"
-"                        \"csv-format\": true,\n"
-"                        \"data\": \"01\",\n"
-"                        \"name\": \"preference\",\n"
-"                        \"never-send\": false,\n"
-"                        \"space\": \"dhcp6\"\n"
-"                    }\n"
-"                ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            }\n"
-"        ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 21
+    // CONFIGURATION 22
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -4854,10 +5088,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -4867,48 +5102,30 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"*\" ],\n"
+"            \"interfaces\": [ ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
-"        \"option-data\": [\n"
-"            {\n"
-"                \"always-send\": false,\n"
-"                \"code\": 38,\n"
-"                \"csv-format\": false,\n"
-"                \"data\": \"ABCDEF0105\",\n"
-"                \"name\": \"subscriber-id\",\n"
-"                \"never-send\": false,\n"
-"                \"space\": \"dhcp6\"\n"
-"            },\n"
-"            {\n"
-"                \"always-send\": false,\n"
-"                \"code\": 38,\n"
-"                \"csv-format\": true,\n"
-"                \"data\": \"1234\",\n"
-"                \"name\": \"foo\",\n"
-"                \"never-send\": false,\n"
-"                \"space\": \"isc\"\n"
-"            }\n"
-"        ],\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
 "                \"array\": false,\n"
-"                \"code\": 38,\n"
-"                \"encapsulate\": \"\",\n"
+"                \"code\": 100,\n"
+"                \"encapsulate\": \"sub-opts-space\",\n"
 "                \"name\": \"foo\",\n"
 "                \"record-types\": \"\",\n"
 "                \"space\": \"isc\",\n"
@@ -4916,11 +5133,6 @@ const char* UNPARSED_CONFIGS[] = {
 "            }\n"
 "        ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
-"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -4929,60 +5141,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            }\n"
-"        ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 22
+    // CONFIGURATION 23
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -5005,10 +5181,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -5018,69 +5195,37 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"*\" ],\n"
+"            \"interfaces\": [ ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
-"        \"option-data\": [\n"
-"            {\n"
-"                \"always-send\": false,\n"
-"                \"code\": 110,\n"
-"                \"csv-format\": true,\n"
-"                \"data\": \"1234\",\n"
-"                \"name\": \"foo\",\n"
-"                \"never-send\": false,\n"
-"                \"space\": \"isc\"\n"
-"            },\n"
-"            {\n"
-"                \"always-send\": false,\n"
-"                \"code\": 111,\n"
-"                \"csv-format\": true,\n"
-"                \"data\": \"192.168.2.1\",\n"
-"                \"name\": \"foo2\",\n"
-"                \"never-send\": false,\n"
-"                \"space\": \"isc\"\n"
-"            }\n"
-"        ],\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
 "                \"array\": false,\n"
-"                \"code\": 110,\n"
+"                \"code\": 109,\n"
 "                \"encapsulate\": \"\",\n"
 "                \"name\": \"foo\",\n"
 "                \"record-types\": \"\",\n"
-"                \"space\": \"isc\",\n"
-"                \"type\": \"uint32\"\n"
-"            },\n"
-"            {\n"
-"                \"array\": false,\n"
-"                \"code\": 111,\n"
-"                \"encapsulate\": \"\",\n"
-"                \"name\": \"foo2\",\n"
-"                \"record-types\": \"\",\n"
-"                \"space\": \"isc\",\n"
-"                \"type\": \"ipv4-address\"\n"
+"                \"space\": \"dhcp4\",\n"
+"                \"type\": \"string\"\n"
 "            }\n"
 "        ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
-"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -5089,28 +5234,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 23
+    // CONFIGURATION 24
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -5133,10 +5274,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -5146,87 +5288,37 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"*\" ],\n"
+"            \"interfaces\": [ ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
-"        \"option-data\": [\n"
-"            {\n"
-"                \"always-send\": false,\n"
-"                \"code\": 100,\n"
-"                \"csv-format\": true,\n"
-"                \"data\": \"11\",\n"
-"                \"name\": \"base-option\",\n"
-"                \"never-send\": false,\n"
-"                \"space\": \"dhcp6\"\n"
-"            },\n"
-"            {\n"
-"                \"always-send\": false,\n"
-"                \"code\": 110,\n"
-"                \"csv-format\": true,\n"
-"                \"data\": \"1234\",\n"
-"                \"name\": \"foo\",\n"
-"                \"never-send\": false,\n"
-"                \"space\": \"isc\"\n"
-"            },\n"
-"            {\n"
-"                \"always-send\": false,\n"
-"                \"code\": 111,\n"
-"                \"csv-format\": true,\n"
-"                \"data\": \"192.168.2.1\",\n"
-"                \"name\": \"foo2\",\n"
-"                \"never-send\": false,\n"
-"                \"space\": \"isc\"\n"
-"            }\n"
-"        ],\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
 "                \"array\": false,\n"
-"                \"code\": 100,\n"
-"                \"encapsulate\": \"isc\",\n"
-"                \"name\": \"base-option\",\n"
-"                \"record-types\": \"\",\n"
-"                \"space\": \"dhcp6\",\n"
-"                \"type\": \"uint8\"\n"
-"            },\n"
-"            {\n"
-"                \"array\": false,\n"
-"                \"code\": 110,\n"
-"                \"encapsulate\": \"\",\n"
-"                \"name\": \"foo\",\n"
-"                \"record-types\": \"\",\n"
-"                \"space\": \"isc\",\n"
-"                \"type\": \"uint32\"\n"
-"            },\n"
-"            {\n"
-"                \"array\": false,\n"
-"                \"code\": 111,\n"
+"                \"code\": 170,\n"
 "                \"encapsulate\": \"\",\n"
-"                \"name\": \"foo2\",\n"
+"                \"name\": \"unassigned-option-170\",\n"
 "                \"record-types\": \"\",\n"
-"                \"space\": \"isc\",\n"
-"                \"type\": \"ipv4-address\"\n"
+"                \"space\": \"dhcp4\",\n"
+"                \"type\": \"string\"\n"
 "            }\n"
 "        ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
-"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -5235,60 +5327,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            }\n"
-"        ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 24
+    // CONFIGURATION 25
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -5311,10 +5367,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -5324,7 +5381,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -5335,19 +5392,36 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
-"        \"option-data\": [ ],\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 56,\n"
+"                \"csv-format\": false,\n"
+"                \"data\": \"ABCDEF0105\",\n"
+"                \"name\": \"dhcp-message\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"dhcp4\"\n"
+"            },\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 23,\n"
+"                \"csv-format\": false,\n"
+"                \"data\": \"01\",\n"
+"                \"name\": \"default-ip-ttl\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"dhcp4\"\n"
+"            }\n"
+"        ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -5357,90 +5431,30 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [\n"
-"                    {\n"
-"                        \"always-send\": false,\n"
-"                        \"code\": 38,\n"
-"                        \"csv-format\": false,\n"
-"                        \"data\": \"0102030405060708090A\",\n"
-"                        \"name\": \"subscriber-id\",\n"
-"                        \"never-send\": false,\n"
-"                        \"space\": \"dhcp6\"\n"
-"                    }\n"
-"                ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            },\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 2,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [\n"
-"                    {\n"
-"                        \"always-send\": false,\n"
-"                        \"code\": 15,\n"
-"                        \"csv-format\": false,\n"
-"                        \"data\": \"FFFEFDFCFB\",\n"
-"                        \"name\": \"user-class\",\n"
-"                        \"never-send\": false,\n"
-"                        \"space\": \"dhcp6\"\n"
-"                    }\n"
-"                ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
+"                \"option-data\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:2::/80\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -5448,20 +5462,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:2::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 25
+    // CONFIGURATION 26
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -5484,10 +5500,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -5497,7 +5514,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -5508,19 +5525,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -5530,96 +5545,49 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [\n"
+"                \"option-data\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"option-data\": [\n"
-"                            {\n"
-"                                \"always-send\": false,\n"
-"                                \"code\": 38,\n"
-"                                \"csv-format\": false,\n"
-"                                \"data\": \"112233445566\",\n"
-"                                \"name\": \"subscriber-id\",\n"
-"                                \"never-send\": false,\n"
-"                                \"space\": \"dhcp6\"\n"
-"                            }\n"
-"                        ],\n"
-"                        \"prefix\": \"3000::\",\n"
-"                        \"prefix-len\": 48\n"
+"                        \"always-send\": false,\n"
+"                        \"code\": 56,\n"
+"                        \"csv-format\": false,\n"
+"                        \"data\": \"ABCDEF0105\",\n"
+"                        \"name\": \"dhcp-message\",\n"
+"                        \"never-send\": false,\n"
+"                        \"space\": \"dhcp4\"\n"
 "                    },\n"
 "                    {\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"option-data\": [\n"
-"                            {\n"
-"                                \"always-send\": false,\n"
-"                                \"code\": 15,\n"
-"                                \"csv-format\": false,\n"
-"                                \"data\": \"AABBCCDDEE\",\n"
-"                                \"name\": \"user-class\",\n"
-"                                \"never-send\": false,\n"
-"                                \"space\": \"dhcp6\"\n"
-"                            }\n"
-"                        ],\n"
-"                        \"prefix\": \"3001::\",\n"
-"                        \"prefix-len\": 48\n"
+"                        \"always-send\": false,\n"
+"                        \"code\": 23,\n"
+"                        \"csv-format\": false,\n"
+"                        \"data\": \"01\",\n"
+"                        \"name\": \"default-ip-ttl\",\n"
+"                        \"never-send\": false,\n"
+"                        \"space\": \"dhcp4\"\n"
 "                    }\n"
 "                ],\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"option-data\": [\n"
-"                            {\n"
-"                                \"always-send\": false,\n"
-"                                \"code\": 38,\n"
-"                                \"csv-format\": false,\n"
-"                                \"data\": \"0102030405060708090A\",\n"
-"                                \"name\": \"subscriber-id\",\n"
-"                                \"never-send\": false,\n"
-"                                \"space\": \"dhcp6\"\n"
-"                            }\n"
-"                        ],\n"
-"                        \"pool\": \"2001:db8:1::10-2001:db8:1::100\"\n"
-"                    },\n"
-"                    {\n"
-"                        \"option-data\": [\n"
-"                            {\n"
-"                                \"always-send\": false,\n"
-"                                \"code\": 15,\n"
-"                                \"csv-format\": false,\n"
-"                                \"data\": \"FFFEFDFCFB\",\n"
-"                                \"name\": \"user-class\",\n"
-"                                \"never-send\": false,\n"
-"                                \"space\": \"dhcp6\"\n"
-"                            }\n"
-"                        ],\n"
-"                        \"pool\": \"2001:db8:1::300-2001:db8:1::400\"\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -5627,20 +5595,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 26
+    // CONFIGURATION 27
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -5663,10 +5633,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -5676,7 +5647,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -5687,36 +5658,46 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
-"                \"code\": 100,\n"
+"                \"code\": 56,\n"
 "                \"csv-format\": false,\n"
-"                \"data\": \"1234\",\n"
+"                \"data\": \"ABCDEF0105\",\n"
+"                \"name\": \"dhcp-message\",\n"
 "                \"never-send\": false,\n"
-"                \"space\": \"vendor-1234\"\n"
+"                \"space\": \"dhcp4\"\n"
 "            },\n"
 "            {\n"
 "                \"always-send\": false,\n"
-"                \"code\": 100,\n"
-"                \"csv-format\": false,\n"
-"                \"data\": \"ABCDEF0105\",\n"
+"                \"code\": 56,\n"
+"                \"csv-format\": true,\n"
+"                \"data\": \"1234\",\n"
+"                \"name\": \"foo\",\n"
 "                \"never-send\": false,\n"
-"                \"space\": \"vendor-4491\"\n"
+"                \"space\": \"isc\"\n"
+"            }\n"
+"        ],\n"
+"        \"option-def\": [\n"
+"            {\n"
+"                \"array\": false,\n"
+"                \"code\": 56,\n"
+"                \"encapsulate\": \"\",\n"
+"                \"name\": \"foo\",\n"
+"                \"record-types\": \"\",\n"
+"                \"space\": \"isc\",\n"
+"                \"type\": \"uint32\"\n"
 "            }\n"
 "        ],\n"
-"        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -5726,39 +5707,30 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -5766,20 +5738,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 27
+    // CONFIGURATION 28
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -5802,10 +5776,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -5815,7 +5790,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -5826,39 +5801,55 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
-"                \"code\": 100,\n"
+"                \"code\": 1,\n"
 "                \"csv-format\": true,\n"
-"                \"data\": \"this is a string vendor-opt\",\n"
+"                \"data\": \"1234\",\n"
 "                \"name\": \"foo\",\n"
 "                \"never-send\": false,\n"
-"                \"space\": \"vendor-4491\"\n"
+"                \"space\": \"isc\"\n"
+"            },\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 2,\n"
+"                \"csv-format\": true,\n"
+"                \"data\": \"192.168.2.1\",\n"
+"                \"name\": \"foo2\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"isc\"\n"
 "            }\n"
 "        ],\n"
 "        \"option-def\": [\n"
 "            {\n"
 "                \"array\": false,\n"
-"                \"code\": 100,\n"
+"                \"code\": 1,\n"
 "                \"encapsulate\": \"\",\n"
 "                \"name\": \"foo\",\n"
 "                \"record-types\": \"\",\n"
-"                \"space\": \"vendor-4491\",\n"
-"                \"type\": \"string\"\n"
+"                \"space\": \"isc\",\n"
+"                \"type\": \"uint32\"\n"
+"            },\n"
+"            {\n"
+"                \"array\": false,\n"
+"                \"code\": 2,\n"
+"                \"encapsulate\": \"\",\n"
+"                \"name\": \"foo2\",\n"
+"                \"record-types\": \"\",\n"
+"                \"space\": \"isc\",\n"
+"                \"type\": \"ipv4-address\"\n"
 "            }\n"
 "        ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -5868,60 +5859,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            }\n"
-"        ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 28
+    // CONFIGURATION 29
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -5944,10 +5899,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -5957,30 +5913,84 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"eth0\" ],\n"
+"            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
-"        \"option-data\": [ ],\n"
-"        \"option-def\": [ ],\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 222,\n"
+"                \"csv-format\": true,\n"
+"                \"data\": \"11\",\n"
+"                \"name\": \"base-option\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"dhcp4\"\n"
+"            },\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 1,\n"
+"                \"csv-format\": true,\n"
+"                \"data\": \"1234\",\n"
+"                \"name\": \"foo\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"isc\"\n"
+"            },\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 2,\n"
+"                \"csv-format\": true,\n"
+"                \"data\": \"192.168.2.1\",\n"
+"                \"name\": \"foo2\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"isc\"\n"
+"            }\n"
+"        ],\n"
+"        \"option-def\": [\n"
+"            {\n"
+"                \"array\": false,\n"
+"                \"code\": 222,\n"
+"                \"encapsulate\": \"isc\",\n"
+"                \"name\": \"base-option\",\n"
+"                \"record-types\": \"\",\n"
+"                \"space\": \"dhcp4\",\n"
+"                \"type\": \"uint8\"\n"
+"            },\n"
+"            {\n"
+"                \"array\": false,\n"
+"                \"code\": 1,\n"
+"                \"encapsulate\": \"\",\n"
+"                \"name\": \"foo\",\n"
+"                \"record-types\": \"\",\n"
+"                \"space\": \"isc\",\n"
+"                \"type\": \"uint32\"\n"
+"            },\n"
+"            {\n"
+"                \"array\": false,\n"
+"                \"code\": 2,\n"
+"                \"encapsulate\": \"\",\n"
+"                \"name\": \"foo2\",\n"
+"                \"record-types\": \"\",\n"
+"                \"space\": \"isc\",\n"
+"                \"type\": \"ipv4-address\"\n"
+"            }\n"
+"        ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -5990,28 +6000,53 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 3000,\n"
+"                \"min-valid-lifetime\": 3000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 3000\n"
+"            }\n"
+"        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 3000\n"
 "    }\n",
-    // CONFIGURATION 29
+    // CONFIGURATION 30
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -6034,10 +6069,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -6047,30 +6083,38 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"*\", \"eth0\", \"eth1\" ],\n"
+"            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
-"        \"option-data\": [ ],\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 56,\n"
+"                \"csv-format\": false,\n"
+"                \"data\": \"AB\",\n"
+"                \"name\": \"dhcp-message\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"dhcp4\"\n"
+"            }\n"
+"        ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -6080,28 +6124,72 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [\n"
+"                    {\n"
+"                        \"always-send\": false,\n"
+"                        \"code\": 56,\n"
+"                        \"csv-format\": false,\n"
+"                        \"data\": \"ABCDEF0105\",\n"
+"                        \"name\": \"dhcp-message\",\n"
+"                        \"never-send\": false,\n"
+"                        \"space\": \"dhcp4\"\n"
+"                    },\n"
+"                    {\n"
+"                        \"always-send\": false,\n"
+"                        \"code\": 23,\n"
+"                        \"csv-format\": false,\n"
+"                        \"data\": \"01\",\n"
+"                        \"name\": \"default-ip-ttl\",\n"
+"                        \"never-send\": false,\n"
+"                        \"space\": \"dhcp4\"\n"
+"                    }\n"
+"                ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 30
+    // CONFIGURATION 31
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -6124,10 +6212,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -6137,7 +6226,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -6148,19 +6237,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -6170,60 +6257,101 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
+"                \"option-data\": [\n"
+"                    {\n"
+"                        \"always-send\": false,\n"
+"                        \"code\": 56,\n"
+"                        \"csv-format\": false,\n"
+"                        \"data\": \"0102030405060708090A\",\n"
+"                        \"name\": \"dhcp-message\",\n"
+"                        \"never-send\": false,\n"
+"                        \"space\": \"dhcp4\"\n"
+"                    }\n"
+"                ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 2,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [\n"
+"                    {\n"
+"                        \"always-send\": false,\n"
+"                        \"code\": 23,\n"
+"                        \"csv-format\": false,\n"
+"                        \"data\": \"FF\",\n"
+"                        \"name\": \"default-ip-ttl\",\n"
+"                        \"never-send\": false,\n"
+"                        \"space\": \"dhcp4\"\n"
+"                    }\n"
+"                ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::1-2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.3.101-192.0.3.150\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
-"                    \"ip-addresses\": [ \"2001:db8:1::abcd\" ]\n"
+"                    \"ip-addresses\": [ ]\n"
 "                },\n"
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 31
+    // CONFIGURATION 32
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -6246,10 +6374,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -6259,7 +6388,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -6270,19 +6399,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -6292,60 +6419,72 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::1-2001:db8:1::ffff\"\n"
+"                        \"option-data\": [\n"
+"                            {\n"
+"                                \"always-send\": false,\n"
+"                                \"code\": 56,\n"
+"                                \"csv-format\": false,\n"
+"                                \"data\": \"ABCDEF0105\",\n"
+"                                \"name\": \"dhcp-message\",\n"
+"                                \"never-send\": false,\n"
+"                                \"space\": \"dhcp4\"\n"
+"                            },\n"
+"                            {\n"
+"                                \"always-send\": false,\n"
+"                                \"code\": 23,\n"
+"                                \"csv-format\": false,\n"
+"                                \"data\": \"01\",\n"
+"                                \"name\": \"default-ip-ttl\",\n"
+"                                \"never-send\": false,\n"
+"                                \"space\": \"dhcp4\"\n"
+"                            }\n"
+"                        ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
-"                    \"ip-addresses\": [ \"2001:db9::abcd\", \"2001:db9::abce\" ]\n"
+"                    \"ip-addresses\": [ ]\n"
 "                },\n"
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 32
+    // CONFIGURATION 33
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -6368,10 +6507,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -6381,7 +6521,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -6392,19 +6532,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -6414,72 +6552,54 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"client-class\": \"alpha\",\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            },\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"client-class\": \"beta\",\n"
-"                \"id\": 2,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
+"                        \"option-data\": [\n"
+"                            {\n"
+"                                \"always-send\": false,\n"
+"                                \"code\": 56,\n"
+"                                \"csv-format\": false,\n"
+"                                \"data\": \"ABCDEF0105\",\n"
+"                                \"name\": \"dhcp-message\",\n"
+"                                \"never-send\": false,\n"
+"                                \"space\": \"dhcp4\"\n"
+"                            }\n"
+"                        ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    },\n"
 "                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:2::/80\"\n"
+"                        \"option-data\": [\n"
+"                            {\n"
+"                                \"always-send\": false,\n"
+"                                \"code\": 23,\n"
+"                                \"csv-format\": false,\n"
+"                                \"data\": \"01\",\n"
+"                                \"name\": \"default-ip-ttl\",\n"
+"                                \"never-send\": false,\n"
+"                                \"space\": \"dhcp4\"\n"
+"                            }\n"
+"                        ],\n"
+"                        \"pool\": \"192.0.2.200-192.0.2.250\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -6487,83 +6607,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:2::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            },\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"client-class\": \"gamma\",\n"
-"                \"id\": 3,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:3::/80\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:3::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            },\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 4,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:4::/80\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:4::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 33
+    // CONFIGURATION 34
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -6586,10 +6645,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -6599,7 +6659,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -6610,19 +6670,36 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
-"        \"option-data\": [ ],\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 78,\n"
+"                \"csv-format\": true,\n"
+"                \"data\": \"true, 10.0.0.3, 127.0.0.1\",\n"
+"                \"name\": \"slp-directory-agent\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"dhcp4\"\n"
+"            },\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 79,\n"
+"                \"csv-format\": true,\n"
+"                \"data\": \"false, \",\n"
+"                \"name\": \"slp-service-scope\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"dhcp4\"\n"
+"            }\n"
+"        ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -6632,54 +6709,30 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
-"                        \"client-class\": \"alpha\",\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
-"                    },\n"
-"                    {\n"
-"                        \"client-class\": \"beta\",\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:2::/80\"\n"
-"                    },\n"
-"                    {\n"
-"                        \"client-class\": \"gamma\",\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:3::/80\"\n"
-"                    },\n"
-"                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:4::/80\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -6687,20 +6740,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8::/40\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 34
+    // CONFIGURATION 35
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -6723,10 +6778,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -6736,7 +6792,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -6747,19 +6803,55 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
-"        \"option-data\": [ ],\n"
-"        \"option-def\": [ ],\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 1,\n"
+"                \"csv-format\": true,\n"
+"                \"data\": \"1234\",\n"
+"                \"name\": \"foo\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"vendor-encapsulated-options-space\"\n"
+"            },\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 2,\n"
+"                \"csv-format\": true,\n"
+"                \"data\": \"192.168.2.1\",\n"
+"                \"name\": \"foo2\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"vendor-encapsulated-options-space\"\n"
+"            }\n"
+"        ],\n"
+"        \"option-def\": [\n"
+"            {\n"
+"                \"array\": false,\n"
+"                \"code\": 1,\n"
+"                \"encapsulate\": \"\",\n"
+"                \"name\": \"foo\",\n"
+"                \"record-types\": \"\",\n"
+"                \"space\": \"vendor-encapsulated-options-space\",\n"
+"                \"type\": \"uint32\"\n"
+"            },\n"
+"            {\n"
+"                \"array\": false,\n"
+"                \"code\": 2,\n"
+"                \"encapsulate\": \"\",\n"
+"                \"name\": \"foo2\",\n"
+"                \"record-types\": \"\",\n"
+"                \"space\": \"vendor-encapsulated-options-space\",\n"
+"                \"type\": \"ipv4-address\"\n"
+"            }\n"
+"        ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -6769,83 +6861,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [\n"
-"                    {\n"
-"                        \"client-class\": \"alpha\",\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"option-data\": [ ],\n"
-"                        \"prefix\": \"2001:db8:1::\",\n"
-"                        \"prefix-len\": 48\n"
-"                    },\n"
-"                    {\n"
-"                        \"client-class\": \"beta\",\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"option-data\": [ ],\n"
-"                        \"prefix\": \"2001:db8:2::\",\n"
-"                        \"prefix-len\": 48\n"
-"                    },\n"
-"                    {\n"
-"                        \"client-class\": \"gamma\",\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"option-data\": [ ],\n"
-"                        \"prefix\": \"2001:db8:3::\",\n"
-"                        \"prefix-len\": 48\n"
-"                    },\n"
-"                    {\n"
-"                        \"delegated-len\": 64,\n"
-"                        \"option-data\": [ ],\n"
-"                        \"prefix\": \"2001:db8:4::\",\n"
-"                        \"prefix-len\": 48\n"
-"                    }\n"
-"                ],\n"
-"                \"pools\": [ ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            }\n"
-"        ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 35
+    // CONFIGURATION 36
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -6856,22 +6889,23 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"ddns-update-on-renew\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
-"            \"enable-updates\": true,\n"
-"            \"max-queue-size\": 2048,\n"
+"            \"enable-updates\": false,\n"
+"            \"max-queue-size\": 1024,\n"
 "            \"ncr-format\": \"JSON\",\n"
 "            \"ncr-protocol\": \"UDP\",\n"
-"            \"sender-ip\": \"3001::2\",\n"
-"            \"sender-port\": 778,\n"
-"            \"server-ip\": \"3001::1\",\n"
-"            \"server-port\": 777\n"
+"            \"sender-ip\": \"0.0.0.0\",\n"
+"            \"sender-port\": 0,\n"
+"            \"server-ip\": \"127.0.0.1\",\n"
+"            \"server-port\": 53001\n"
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -6881,7 +6915,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -6892,19 +6926,64 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
-"        \"option-data\": [ ],\n"
-"        \"option-def\": [ ],\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 43,\n"
+"                \"csv-format\": false,\n"
+"                \"data\": \"\",\n"
+"                \"name\": \"vendor-encapsulated-options\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"dhcp4\"\n"
+"            },\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 1,\n"
+"                \"csv-format\": true,\n"
+"                \"data\": \"1234\",\n"
+"                \"name\": \"foo\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"vendor-encapsulated-options-space\"\n"
+"            },\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 2,\n"
+"                \"csv-format\": true,\n"
+"                \"data\": \"192.168.2.1\",\n"
+"                \"name\": \"foo2\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"vendor-encapsulated-options-space\"\n"
+"            }\n"
+"        ],\n"
+"        \"option-def\": [\n"
+"            {\n"
+"                \"array\": false,\n"
+"                \"code\": 1,\n"
+"                \"encapsulate\": \"\",\n"
+"                \"name\": \"foo\",\n"
+"                \"record-types\": \"\",\n"
+"                \"space\": \"vendor-encapsulated-options-space\",\n"
+"                \"type\": \"uint32\"\n"
+"            },\n"
+"            {\n"
+"                \"array\": false,\n"
+"                \"code\": 2,\n"
+"                \"encapsulate\": \"\",\n"
+"                \"name\": \"foo2\",\n"
+"                \"record-types\": \"\",\n"
+"                \"space\": \"vendor-encapsulated-options-space\",\n"
+"                \"type\": \"ipv4-address\"\n"
+"            }\n"
+"        ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -6914,39 +6993,30 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
+"                \"max-valid-lifetime\": 3000,\n"
+"                \"min-valid-lifetime\": 3000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -6954,20 +7024,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 3000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 3000\n"
 "    }\n",
-    // CONFIGURATION 36
+    // CONFIGURATION 37
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -6990,10 +7062,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -7003,7 +7076,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -7014,19 +7087,34 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
-"        \"option-data\": [ ],\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 100,\n"
+"                \"csv-format\": false,\n"
+"                \"data\": \"1234\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"vendor-1234\"\n"
+"            },\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 100,\n"
+"                \"csv-format\": false,\n"
+"                \"data\": \"ABCDEF0105\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"vendor-4491\"\n"
+"            }\n"
+"        ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -7036,39 +7124,30 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 123,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.10\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -7076,163 +7155,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            },\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 234,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [ ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [\n"
-"                    {\n"
-"                        \"client-classes\": [ ],\n"
-"                        \"hostname\": \"\",\n"
-"                        \"hw-address\": \"01:02:03:04:05:06\",\n"
-"                        \"ip-addresses\": [ \"2001:db8:2::abcd\" ],\n"
-"                        \"option-data\": [\n"
-"                            {\n"
-"                                \"always-send\": false,\n"
-"                                \"code\": 23,\n"
-"                                \"csv-format\": true,\n"
-"                                \"data\": \"2001:db8:2::abbc\",\n"
-"                                \"name\": \"dns-servers\",\n"
-"                                \"never-send\": false,\n"
-"                                \"space\": \"dhcp6\"\n"
-"                            },\n"
-"                            {\n"
-"                                \"always-send\": false,\n"
-"                                \"code\": 7,\n"
-"                                \"csv-format\": true,\n"
-"                                \"data\": \"25\",\n"
-"                                \"name\": \"preference\",\n"
-"                                \"never-send\": false,\n"
-"                                \"space\": \"dhcp6\"\n"
-"                            }\n"
-"                        ],\n"
-"                        \"prefixes\": [ ]\n"
-"                    },\n"
-"                    {\n"
-"                        \"client-classes\": [ ],\n"
-"                        \"duid\": \"01:02:03:04:05:06:07:08:09:0a\",\n"
-"                        \"hostname\": \"\",\n"
-"                        \"ip-addresses\": [ \"2001:db8:2::1234\" ],\n"
-"                        \"option-data\": [\n"
-"                            {\n"
-"                                \"always-send\": false,\n"
-"                                \"code\": 23,\n"
-"                                \"csv-format\": true,\n"
-"                                \"data\": \"2001:db8:2::1111\",\n"
-"                                \"name\": \"dns-servers\",\n"
-"                                \"never-send\": false,\n"
-"                                \"space\": \"dhcp6\"\n"
-"                            },\n"
-"                            {\n"
-"                                \"always-send\": false,\n"
-"                                \"code\": 7,\n"
-"                                \"csv-format\": true,\n"
-"                                \"data\": \"11\",\n"
-"                                \"name\": \"preference\",\n"
-"                                \"never-send\": false,\n"
-"                                \"space\": \"dhcp6\"\n"
-"                            }\n"
-"                        ],\n"
-"                        \"prefixes\": [ ]\n"
-"                    }\n"
-"                ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:2::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            },\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 542,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [ ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [\n"
-"                    {\n"
-"                        \"client-classes\": [ ],\n"
-"                        \"hostname\": \"\",\n"
-"                        \"hw-address\": \"06:05:04:03:02:01\",\n"
-"                        \"ip-addresses\": [ ],\n"
-"                        \"option-data\": [ ],\n"
-"                        \"prefixes\": [ \"2001:db8:3:1::/96\" ]\n"
-"                    },\n"
-"                    {\n"
-"                        \"client-classes\": [ ],\n"
-"                        \"duid\": \"0a:09:08:07:06:05:04:03:02:01\",\n"
-"                        \"hostname\": \"\",\n"
-"                        \"ip-addresses\": [ ],\n"
-"                        \"option-data\": [\n"
-"                            {\n"
-"                                \"always-send\": false,\n"
-"                                \"code\": 23,\n"
-"                                \"csv-format\": true,\n"
-"                                \"data\": \"2001:db8:3::3333\",\n"
-"                                \"name\": \"dns-servers\",\n"
-"                                \"never-send\": false,\n"
-"                                \"space\": \"dhcp6\"\n"
-"                            },\n"
-"                            {\n"
-"                                \"always-send\": false,\n"
-"                                \"code\": 7,\n"
-"                                \"csv-format\": true,\n"
-"                                \"data\": \"33\",\n"
-"                                \"name\": \"preference\",\n"
-"                                \"never-send\": false,\n"
-"                                \"space\": \"dhcp6\"\n"
-"                            }\n"
-"                        ],\n"
-"                        \"prefixes\": [ \"2001:db8:3:2::/96\" ]\n"
-"                    }\n"
-"                ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:3::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 37
+    // CONFIGURATION 38
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -7255,10 +7193,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -7268,7 +7207,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -7279,13 +7218,24 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
-"        \"option-data\": [ ],\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [\n"
+"            {\n"
+"                \"always-send\": false,\n"
+"                \"code\": 100,\n"
+"                \"csv-format\": true,\n"
+"                \"data\": \"this is a string vendor-opt\",\n"
+"                \"name\": \"foo\",\n"
+"                \"never-send\": false,\n"
+"                \"space\": \"vendor-4491\"\n"
+"            }\n"
+"        ],\n"
 "        \"option-def\": [\n"
 "            {\n"
 "                \"array\": false,\n"
@@ -7293,15 +7243,12 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"encapsulate\": \"\",\n"
 "                \"name\": \"foo\",\n"
 "                \"record-types\": \"\",\n"
-"                \"space\": \"isc\",\n"
-"                \"type\": \"uint32\"\n"
+"                \"space\": \"vendor-4491\",\n"
+"                \"type\": \"string\"\n"
 "            }\n"
 "        ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -7311,74 +7258,53 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 234,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [ ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
 "                },\n"
 "                \"renew-timer\": 1000,\n"
-"                \"reservations\": [\n"
-"                    {\n"
-"                        \"client-classes\": [ ],\n"
-"                        \"duid\": \"01:02:03:04:05:06:07:08:09:0a\",\n"
-"                        \"hostname\": \"\",\n"
-"                        \"ip-addresses\": [ \"2001:db8:2::1234\" ],\n"
-"                        \"option-data\": [\n"
-"                            {\n"
-"                                \"always-send\": false,\n"
-"                                \"code\": 100,\n"
-"                                \"csv-format\": true,\n"
-"                                \"data\": \"11\",\n"
-"                                \"name\": \"foo\",\n"
-"                                \"never-send\": false,\n"
-"                                \"space\": \"isc\"\n"
-"                            }\n"
-"                        ],\n"
-"                        \"prefixes\": [ ]\n"
-"                    }\n"
-"                ],\n"
+"                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:2::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 38
+    // CONFIGURATION 39
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -7401,10 +7327,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -7414,30 +7341,28 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"*\" ],\n"
+"            \"interfaces\": [ \"eth0\", \"eth1\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"client-link-addr-option\", \"remote-id\", \"subscriber-id\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -7447,28 +7372,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 39
+    // CONFIGURATION 40
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -7491,10 +7412,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -7504,30 +7426,28 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ \"*\" ],\n"
+"            \"interfaces\": [ \"*\", \"eth0\", \"eth1\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"client-link-addr-option\", \"remote-id\", \"subscriber-id\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -7537,28 +7457,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 40
+    // CONFIGURATION 41
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -7569,22 +7485,23 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"ddns-update-on-renew\": false,\n"
 "        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
-"            \"enable-updates\": false,\n"
-"            \"max-queue-size\": 1024,\n"
+"            \"enable-updates\": true,\n"
+"            \"max-queue-size\": 2048,\n"
 "            \"ncr-format\": \"JSON\",\n"
 "            \"ncr-protocol\": \"UDP\",\n"
-"            \"sender-ip\": \"0.0.0.0\",\n"
-"            \"sender-port\": 0,\n"
-"            \"server-ip\": \"127.0.0.1\",\n"
-"            \"server-port\": 53001\n"
+"            \"sender-ip\": \"192.168.2.2\",\n"
+"            \"sender-port\": 778,\n"
+"            \"server-ip\": \"192.168.2.1\",\n"
+"            \"server-port\": 777\n"
 "        },\n"
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -7594,30 +7511,28 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ ],\n"
+"            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -7627,204 +7542,1307 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/64\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"reservations-global\": false,\n"
-"                \"reservations-in-subnet\": true,\n"
-"                \"reservations-out-of-pool\": false,\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/48\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            },\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 2,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:2::/64\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
 "                },\n"
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
-"                \"reservations-global\": false,\n"
-"                \"reservations-in-subnet\": true,\n"
-"                \"reservations-out-of-pool\": true,\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:2::/48\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
-"            },\n"
+"            }\n"
+"        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 42
+"{\n"
+"        \"allocator\": \"iterative\",\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
+"        \"ddns-generated-prefix\": \"myhost\",\n"
+"        \"ddns-override-client-update\": false,\n"
+"        \"ddns-override-no-update\": false,\n"
+"        \"ddns-qualifying-suffix\": \"\",\n"
+"        \"ddns-replace-client-name\": \"never\",\n"
+"        \"ddns-send-updates\": true,\n"
+"        \"ddns-update-on-renew\": false,\n"
+"        \"decline-probation-period\": 86400,\n"
+"        \"dhcp-ddns\": {\n"
+"            \"enable-updates\": false,\n"
+"            \"max-queue-size\": 1024,\n"
+"            \"ncr-format\": \"JSON\",\n"
+"            \"ncr-protocol\": \"UDP\",\n"
+"            \"sender-ip\": \"0.0.0.0\",\n"
+"            \"sender-port\": 0,\n"
+"            \"server-ip\": \"127.0.0.1\",\n"
+"            \"server-port\": 53001\n"
+"        },\n"
+"        \"dhcp-queue-control\": {\n"
+"            \"capacity\": 64,\n"
+"            \"enable-queue\": false,\n"
+"            \"queue-type\": \"kea-ring4\"\n"
+"        },\n"
+"        \"dhcp4o6-port\": 0,\n"
+"        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
+"        \"expired-leases-processing\": {\n"
+"            \"flush-reclaimed-timer-wait-time\": 25,\n"
+"            \"hold-reclaimed-time\": 3600,\n"
+"            \"max-reclaim-leases\": 100,\n"
+"            \"max-reclaim-time\": 250,\n"
+"            \"reclaim-timer-wait-time\": 10,\n"
+"            \"unwarned-reclaim-cycles\": 5\n"
+"        },\n"
+"        \"hooks-libraries\": [ ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
+"        \"hostname-char-replacement\": \"\",\n"
+"        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"ip-reservations-unique\": true,\n"
+"        \"lease-database\": {\n"
+"            \"type\": \"memfile\"\n"
+"        },\n"
+"        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": true,\n"
+"            \"packet-queue-size\": 64,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
+"        \"option-def\": [ ],\n"
+"        \"parked-packet-limit\": 256,\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"reservations-global\": false,\n"
+"        \"reservations-in-subnet\": true,\n"
+"        \"reservations-lookup-first\": false,\n"
+"        \"reservations-out-of-pool\": false,\n"
+"        \"sanity-checks\": {\n"
+"            \"extended-info-checks\": \"fix\",\n"
+"            \"lease-checks\": \"warn\"\n"
+"        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
+"        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
+"        \"statistic-default-sample-age\": 0,\n"
+"        \"statistic-default-sample-count\": 20,\n"
+"        \"store-extended-info\": false,\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 3,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4,\n"
+"                \"min-valid-lifetime\": 4,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:3::/64\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
+"                \"rebind-timer\": 2,\n"
 "                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
+"                    \"ip-addresses\": [ \"192.0.2.123\" ]\n"
 "                },\n"
-"                \"renew-timer\": 1000,\n"
+"                \"renew-timer\": 1,\n"
 "                \"reservations\": [ ],\n"
-"                \"reservations-global\": false,\n"
-"                \"reservations-in-subnet\": false,\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:3::/48\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            },\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 4,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:4::/64\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4\n"
+"            }\n"
+"        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 43
+"{\n"
+"        \"allocator\": \"iterative\",\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
+"        \"ddns-generated-prefix\": \"myhost\",\n"
+"        \"ddns-override-client-update\": false,\n"
+"        \"ddns-override-no-update\": false,\n"
+"        \"ddns-qualifying-suffix\": \"\",\n"
+"        \"ddns-replace-client-name\": \"never\",\n"
+"        \"ddns-send-updates\": true,\n"
+"        \"ddns-update-on-renew\": false,\n"
+"        \"decline-probation-period\": 86400,\n"
+"        \"dhcp-ddns\": {\n"
+"            \"enable-updates\": false,\n"
+"            \"max-queue-size\": 1024,\n"
+"            \"ncr-format\": \"JSON\",\n"
+"            \"ncr-protocol\": \"UDP\",\n"
+"            \"sender-ip\": \"0.0.0.0\",\n"
+"            \"sender-port\": 0,\n"
+"            \"server-ip\": \"127.0.0.1\",\n"
+"            \"server-port\": 53001\n"
+"        },\n"
+"        \"dhcp-queue-control\": {\n"
+"            \"capacity\": 64,\n"
+"            \"enable-queue\": false,\n"
+"            \"queue-type\": \"kea-ring4\"\n"
+"        },\n"
+"        \"dhcp4o6-port\": 0,\n"
+"        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
+"        \"expired-leases-processing\": {\n"
+"            \"flush-reclaimed-timer-wait-time\": 25,\n"
+"            \"hold-reclaimed-time\": 3600,\n"
+"            \"max-reclaim-leases\": 100,\n"
+"            \"max-reclaim-time\": 250,\n"
+"            \"reclaim-timer-wait-time\": 10,\n"
+"            \"unwarned-reclaim-cycles\": 5\n"
+"        },\n"
+"        \"hooks-libraries\": [ ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
+"        \"hostname-char-replacement\": \"\",\n"
+"        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"ip-reservations-unique\": true,\n"
+"        \"lease-database\": {\n"
+"            \"type\": \"memfile\"\n"
+"        },\n"
+"        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": true,\n"
+"            \"packet-queue-size\": 64,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
+"        \"option-def\": [ ],\n"
+"        \"parked-packet-limit\": 256,\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"reservations-global\": false,\n"
+"        \"reservations-in-subnet\": true,\n"
+"        \"reservations-lookup-first\": false,\n"
+"        \"reservations-out-of-pool\": false,\n"
+"        \"sanity-checks\": {\n"
+"            \"extended-info-checks\": \"fix\",\n"
+"            \"lease-checks\": \"warn\"\n"
+"        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
+"        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
+"        \"statistic-default-sample-age\": 0,\n"
+"        \"statistic-default-sample-count\": 20,\n"
+"        \"store-extended-info\": false,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4,\n"
+"                \"min-valid-lifetime\": 4,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ \"192.0.3.123\", \"192.0.3.124\" ]\n"
+"                },\n"
+"                \"renew-timer\": 1,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4\n"
+"            }\n"
+"        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 44
+"{\n"
+"        \"allocator\": \"iterative\",\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
+"        \"ddns-generated-prefix\": \"myhost\",\n"
+"        \"ddns-override-client-update\": false,\n"
+"        \"ddns-override-no-update\": false,\n"
+"        \"ddns-qualifying-suffix\": \"\",\n"
+"        \"ddns-replace-client-name\": \"never\",\n"
+"        \"ddns-send-updates\": true,\n"
+"        \"ddns-update-on-renew\": false,\n"
+"        \"decline-probation-period\": 86400,\n"
+"        \"dhcp-ddns\": {\n"
+"            \"enable-updates\": false,\n"
+"            \"max-queue-size\": 1024,\n"
+"            \"ncr-format\": \"JSON\",\n"
+"            \"ncr-protocol\": \"UDP\",\n"
+"            \"sender-ip\": \"0.0.0.0\",\n"
+"            \"sender-port\": 0,\n"
+"            \"server-ip\": \"127.0.0.1\",\n"
+"            \"server-port\": 53001\n"
+"        },\n"
+"        \"dhcp-queue-control\": {\n"
+"            \"capacity\": 64,\n"
+"            \"enable-queue\": false,\n"
+"            \"queue-type\": \"kea-ring4\"\n"
+"        },\n"
+"        \"dhcp4o6-port\": 0,\n"
+"        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
+"        \"expired-leases-processing\": {\n"
+"            \"flush-reclaimed-timer-wait-time\": 25,\n"
+"            \"hold-reclaimed-time\": 3600,\n"
+"            \"max-reclaim-leases\": 100,\n"
+"            \"max-reclaim-time\": 250,\n"
+"            \"reclaim-timer-wait-time\": 10,\n"
+"            \"unwarned-reclaim-cycles\": 5\n"
+"        },\n"
+"        \"hooks-libraries\": [ ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
+"        \"hostname-char-replacement\": \"\",\n"
+"        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"ip-reservations-unique\": true,\n"
+"        \"lease-database\": {\n"
+"            \"type\": \"memfile\"\n"
+"        },\n"
+"        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": true,\n"
+"            \"packet-queue-size\": 64,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
+"        \"option-def\": [ ],\n"
+"        \"parked-packet-limit\": 256,\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"reservations-global\": false,\n"
+"        \"reservations-in-subnet\": true,\n"
+"        \"reservations-lookup-first\": false,\n"
+"        \"reservations-out-of-pool\": false,\n"
+"        \"sanity-checks\": {\n"
+"            \"extended-info-checks\": \"fix\",\n"
+"            \"lease-checks\": \"warn\"\n"
+"        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
+"        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
+"        \"statistic-default-sample-age\": 0,\n"
+"        \"statistic-default-sample-count\": 20,\n"
+"        \"store-extended-info\": false,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"client-class\": \"alpha\",\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"client-class\": \"beta\",\n"
+"                \"id\": 2,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.3.101-192.0.3.150\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"client-class\": \"gamma\",\n"
+"                \"id\": 3,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.4.101-192.0.4.150\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.4.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 4,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.5.101-192.0.5.150\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.5.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 45
+"{\n"
+"        \"allocator\": \"iterative\",\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
+"        \"ddns-generated-prefix\": \"myhost\",\n"
+"        \"ddns-override-client-update\": false,\n"
+"        \"ddns-override-no-update\": false,\n"
+"        \"ddns-qualifying-suffix\": \"\",\n"
+"        \"ddns-replace-client-name\": \"never\",\n"
+"        \"ddns-send-updates\": true,\n"
+"        \"ddns-update-on-renew\": false,\n"
+"        \"decline-probation-period\": 86400,\n"
+"        \"dhcp-ddns\": {\n"
+"            \"enable-updates\": false,\n"
+"            \"max-queue-size\": 1024,\n"
+"            \"ncr-format\": \"JSON\",\n"
+"            \"ncr-protocol\": \"UDP\",\n"
+"            \"sender-ip\": \"0.0.0.0\",\n"
+"            \"sender-port\": 0,\n"
+"            \"server-ip\": \"127.0.0.1\",\n"
+"            \"server-port\": 53001\n"
+"        },\n"
+"        \"dhcp-queue-control\": {\n"
+"            \"capacity\": 64,\n"
+"            \"enable-queue\": false,\n"
+"            \"queue-type\": \"kea-ring4\"\n"
+"        },\n"
+"        \"dhcp4o6-port\": 0,\n"
+"        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
+"        \"expired-leases-processing\": {\n"
+"            \"flush-reclaimed-timer-wait-time\": 25,\n"
+"            \"hold-reclaimed-time\": 3600,\n"
+"            \"max-reclaim-leases\": 100,\n"
+"            \"max-reclaim-time\": 250,\n"
+"            \"reclaim-timer-wait-time\": 10,\n"
+"            \"unwarned-reclaim-cycles\": 5\n"
+"        },\n"
+"        \"hooks-libraries\": [ ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
+"        \"hostname-char-replacement\": \"\",\n"
+"        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"ip-reservations-unique\": true,\n"
+"        \"lease-database\": {\n"
+"            \"type\": \"memfile\"\n"
+"        },\n"
+"        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": true,\n"
+"            \"packet-queue-size\": 64,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
+"        \"option-def\": [ ],\n"
+"        \"parked-packet-limit\": 256,\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"reservations-global\": false,\n"
+"        \"reservations-in-subnet\": true,\n"
+"        \"reservations-lookup-first\": false,\n"
+"        \"reservations-out-of-pool\": false,\n"
+"        \"sanity-checks\": {\n"
+"            \"extended-info-checks\": \"fix\",\n"
+"            \"lease-checks\": \"warn\"\n"
+"        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
+"        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
+"        \"statistic-default-sample-age\": 0,\n"
+"        \"statistic-default-sample-count\": 20,\n"
+"        \"store-extended-info\": false,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"client-class\": \"alpha\",\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    },\n"
+"                    {\n"
+"                        \"client-class\": \"beta\",\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.3.101-192.0.3.150\"\n"
+"                    },\n"
+"                    {\n"
+"                        \"client-class\": \"gamma\",\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.4.101-192.0.4.150\"\n"
+"                    },\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.5.101-192.0.5.150\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.0.0/16\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 46
+"{\n"
+"        \"allocator\": \"iterative\",\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
+"        \"ddns-generated-prefix\": \"myhost\",\n"
+"        \"ddns-override-client-update\": false,\n"
+"        \"ddns-override-no-update\": false,\n"
+"        \"ddns-qualifying-suffix\": \"\",\n"
+"        \"ddns-replace-client-name\": \"never\",\n"
+"        \"ddns-send-updates\": true,\n"
+"        \"ddns-update-on-renew\": false,\n"
+"        \"decline-probation-period\": 86400,\n"
+"        \"dhcp-ddns\": {\n"
+"            \"enable-updates\": false,\n"
+"            \"max-queue-size\": 1024,\n"
+"            \"ncr-format\": \"JSON\",\n"
+"            \"ncr-protocol\": \"UDP\",\n"
+"            \"sender-ip\": \"0.0.0.0\",\n"
+"            \"sender-port\": 0,\n"
+"            \"server-ip\": \"127.0.0.1\",\n"
+"            \"server-port\": 53001\n"
+"        },\n"
+"        \"dhcp-queue-control\": {\n"
+"            \"capacity\": 64,\n"
+"            \"enable-queue\": false,\n"
+"            \"queue-type\": \"kea-ring4\"\n"
+"        },\n"
+"        \"dhcp4o6-port\": 0,\n"
+"        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
+"        \"expired-leases-processing\": {\n"
+"            \"flush-reclaimed-timer-wait-time\": 25,\n"
+"            \"hold-reclaimed-time\": 3600,\n"
+"            \"max-reclaim-leases\": 100,\n"
+"            \"max-reclaim-time\": 250,\n"
+"            \"reclaim-timer-wait-time\": 10,\n"
+"            \"unwarned-reclaim-cycles\": 5\n"
+"        },\n"
+"        \"hooks-libraries\": [ ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
+"        \"hostname-char-replacement\": \"\",\n"
+"        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"ip-reservations-unique\": true,\n"
+"        \"lease-database\": {\n"
+"            \"type\": \"memfile\"\n"
+"        },\n"
+"        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": true,\n"
+"            \"packet-queue-size\": 64,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
+"        \"option-def\": [ ],\n"
+"        \"parked-packet-limit\": 256,\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"reservations-global\": false,\n"
+"        \"reservations-in-subnet\": true,\n"
+"        \"reservations-lookup-first\": false,\n"
+"        \"reservations-out-of-pool\": false,\n"
+"        \"sanity-checks\": {\n"
+"            \"extended-info-checks\": \"fix\",\n"
+"            \"lease-checks\": \"warn\"\n"
+"        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
+"        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
+"        \"statistic-default-sample-age\": 0,\n"
+"        \"statistic-default-sample-count\": 20,\n"
+"        \"store-extended-info\": false,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 123,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 234,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.3.101-192.0.3.150\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [\n"
+"                    {\n"
+"                        \"boot-file-name\": \"\",\n"
+"                        \"client-classes\": [ ],\n"
+"                        \"hostname\": \"\",\n"
+"                        \"hw-address\": \"01:02:03:04:05:06\",\n"
+"                        \"ip-address\": \"192.0.3.120\",\n"
+"                        \"next-server\": \"0.0.0.0\",\n"
+"                        \"option-data\": [\n"
+"                            {\n"
+"                                \"always-send\": false,\n"
+"                                \"code\": 5,\n"
+"                                \"csv-format\": true,\n"
+"                                \"data\": \"192.0.3.95\",\n"
+"                                \"name\": \"name-servers\",\n"
+"                                \"never-send\": false,\n"
+"                                \"space\": \"dhcp4\"\n"
+"                            },\n"
+"                            {\n"
+"                                \"always-send\": false,\n"
+"                                \"code\": 23,\n"
+"                                \"csv-format\": true,\n"
+"                                \"data\": \"11\",\n"
+"                                \"name\": \"default-ip-ttl\",\n"
+"                                \"never-send\": false,\n"
+"                                \"space\": \"dhcp4\"\n"
+"                            }\n"
+"                        ],\n"
+"                        \"server-hostname\": \"\"\n"
+"                    },\n"
+"                    {\n"
+"                        \"boot-file-name\": \"\",\n"
+"                        \"client-classes\": [ ],\n"
+"                        \"duid\": \"01:02:03:04:05:06:07:08:09:0a\",\n"
+"                        \"hostname\": \"\",\n"
+"                        \"ip-address\": \"192.0.3.112\",\n"
+"                        \"next-server\": \"0.0.0.0\",\n"
+"                        \"option-data\": [\n"
+"                            {\n"
+"                                \"always-send\": false,\n"
+"                                \"code\": 5,\n"
+"                                \"csv-format\": true,\n"
+"                                \"data\": \"192.0.3.15\",\n"
+"                                \"name\": \"name-servers\",\n"
+"                                \"never-send\": false,\n"
+"                                \"space\": \"dhcp4\"\n"
+"                            },\n"
+"                            {\n"
+"                                \"always-send\": false,\n"
+"                                \"code\": 23,\n"
+"                                \"csv-format\": true,\n"
+"                                \"data\": \"32\",\n"
+"                                \"name\": \"default-ip-ttl\",\n"
+"                                \"never-send\": false,\n"
+"                                \"space\": \"dhcp4\"\n"
+"                            }\n"
+"                        ],\n"
+"                        \"server-hostname\": \"\"\n"
+"                    }\n"
+"                ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 542,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.4.101-192.0.4.150\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [\n"
+"                    {\n"
+"                        \"boot-file-name\": \"\",\n"
+"                        \"client-classes\": [ ],\n"
+"                        \"client-id\": \"05010203040506\",\n"
+"                        \"hostname\": \"\",\n"
+"                        \"ip-address\": \"192.0.4.103\",\n"
+"                        \"next-server\": \"0.0.0.0\",\n"
+"                        \"option-data\": [ ],\n"
+"                        \"server-hostname\": \"\"\n"
+"                    },\n"
+"                    {\n"
+"                        \"boot-file-name\": \"\",\n"
+"                        \"circuit-id\": \"060504030201\",\n"
+"                        \"client-classes\": [ ],\n"
+"                        \"hostname\": \"\",\n"
+"                        \"ip-address\": \"192.0.4.102\",\n"
+"                        \"next-server\": \"0.0.0.0\",\n"
+"                        \"option-data\": [ ],\n"
+"                        \"server-hostname\": \"\"\n"
+"                    },\n"
+"                    {\n"
+"                        \"boot-file-name\": \"\",\n"
+"                        \"client-classes\": [ ],\n"
+"                        \"duid\": \"0a:09:08:07:06:05:04:03:02:01\",\n"
+"                        \"hostname\": \"\",\n"
+"                        \"ip-address\": \"192.0.4.101\",\n"
+"                        \"next-server\": \"0.0.0.0\",\n"
+"                        \"option-data\": [\n"
+"                            {\n"
+"                                \"always-send\": false,\n"
+"                                \"code\": 5,\n"
+"                                \"csv-format\": true,\n"
+"                                \"data\": \"192.0.4.11\",\n"
+"                                \"name\": \"name-servers\",\n"
+"                                \"never-send\": false,\n"
+"                                \"space\": \"dhcp4\"\n"
+"                            },\n"
+"                            {\n"
+"                                \"always-send\": false,\n"
+"                                \"code\": 23,\n"
+"                                \"csv-format\": true,\n"
+"                                \"data\": \"95\",\n"
+"                                \"name\": \"default-ip-ttl\",\n"
+"                                \"never-send\": false,\n"
+"                                \"space\": \"dhcp4\"\n"
+"                            }\n"
+"                        ],\n"
+"                        \"server-hostname\": \"\"\n"
+"                    }\n"
+"                ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.4.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 47
+"{\n"
+"        \"allocator\": \"iterative\",\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
+"        \"ddns-generated-prefix\": \"myhost\",\n"
+"        \"ddns-override-client-update\": false,\n"
+"        \"ddns-override-no-update\": false,\n"
+"        \"ddns-qualifying-suffix\": \"\",\n"
+"        \"ddns-replace-client-name\": \"never\",\n"
+"        \"ddns-send-updates\": true,\n"
+"        \"ddns-update-on-renew\": false,\n"
+"        \"decline-probation-period\": 86400,\n"
+"        \"dhcp-ddns\": {\n"
+"            \"enable-updates\": false,\n"
+"            \"max-queue-size\": 1024,\n"
+"            \"ncr-format\": \"JSON\",\n"
+"            \"ncr-protocol\": \"UDP\",\n"
+"            \"sender-ip\": \"0.0.0.0\",\n"
+"            \"sender-port\": 0,\n"
+"            \"server-ip\": \"127.0.0.1\",\n"
+"            \"server-port\": 53001\n"
+"        },\n"
+"        \"dhcp-queue-control\": {\n"
+"            \"capacity\": 64,\n"
+"            \"enable-queue\": false,\n"
+"            \"queue-type\": \"kea-ring4\"\n"
+"        },\n"
+"        \"dhcp4o6-port\": 0,\n"
+"        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
+"        \"expired-leases-processing\": {\n"
+"            \"flush-reclaimed-timer-wait-time\": 25,\n"
+"            \"hold-reclaimed-time\": 3600,\n"
+"            \"max-reclaim-leases\": 100,\n"
+"            \"max-reclaim-time\": 250,\n"
+"            \"reclaim-timer-wait-time\": 10,\n"
+"            \"unwarned-reclaim-cycles\": 5\n"
+"        },\n"
+"        \"hooks-libraries\": [ ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
+"        \"hostname-char-replacement\": \"\",\n"
+"        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"ip-reservations-unique\": true,\n"
+"        \"lease-database\": {\n"
+"            \"type\": \"memfile\"\n"
+"        },\n"
+"        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": true,\n"
+"            \"packet-queue-size\": 64,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
+"        \"option-def\": [\n"
+"            {\n"
+"                \"array\": false,\n"
+"                \"code\": 100,\n"
+"                \"encapsulate\": \"\",\n"
+"                \"name\": \"foo\",\n"
+"                \"record-types\": \"\",\n"
+"                \"space\": \"isc\",\n"
+"                \"type\": \"uint32\"\n"
+"            }\n"
+"        ],\n"
+"        \"parked-packet-limit\": 256,\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"reservations-global\": false,\n"
+"        \"reservations-in-subnet\": true,\n"
+"        \"reservations-lookup-first\": false,\n"
+"        \"reservations-out-of-pool\": false,\n"
+"        \"sanity-checks\": {\n"
+"            \"extended-info-checks\": \"fix\",\n"
+"            \"lease-checks\": \"warn\"\n"
+"        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
+"        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
+"        \"statistic-default-sample-age\": 0,\n"
+"        \"statistic-default-sample-count\": 20,\n"
+"        \"store-extended-info\": false,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 234,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.3.101-192.0.3.150\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [\n"
+"                    {\n"
+"                        \"boot-file-name\": \"\",\n"
+"                        \"client-classes\": [ ],\n"
+"                        \"duid\": \"01:02:03:04:05:06:07:08:09:0a\",\n"
+"                        \"hostname\": \"\",\n"
+"                        \"ip-address\": \"192.0.3.112\",\n"
+"                        \"next-server\": \"0.0.0.0\",\n"
+"                        \"option-data\": [\n"
+"                            {\n"
+"                                \"always-send\": false,\n"
+"                                \"code\": 100,\n"
+"                                \"csv-format\": true,\n"
+"                                \"data\": \"123\",\n"
+"                                \"name\": \"foo\",\n"
+"                                \"never-send\": false,\n"
+"                                \"space\": \"isc\"\n"
+"                            }\n"
+"                        ],\n"
+"                        \"server-hostname\": \"\"\n"
+"                    }\n"
+"                ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 48
+"{\n"
+"        \"allocator\": \"iterative\",\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
+"        \"ddns-generated-prefix\": \"myhost\",\n"
+"        \"ddns-override-client-update\": false,\n"
+"        \"ddns-override-no-update\": false,\n"
+"        \"ddns-qualifying-suffix\": \"\",\n"
+"        \"ddns-replace-client-name\": \"never\",\n"
+"        \"ddns-send-updates\": true,\n"
+"        \"ddns-update-on-renew\": false,\n"
+"        \"decline-probation-period\": 86400,\n"
+"        \"dhcp-ddns\": {\n"
+"            \"enable-updates\": false,\n"
+"            \"max-queue-size\": 1024,\n"
+"            \"ncr-format\": \"JSON\",\n"
+"            \"ncr-protocol\": \"UDP\",\n"
+"            \"sender-ip\": \"0.0.0.0\",\n"
+"            \"sender-port\": 0,\n"
+"            \"server-ip\": \"127.0.0.1\",\n"
+"            \"server-port\": 53001\n"
+"        },\n"
+"        \"dhcp-queue-control\": {\n"
+"            \"capacity\": 64,\n"
+"            \"enable-queue\": false,\n"
+"            \"queue-type\": \"kea-ring4\"\n"
+"        },\n"
+"        \"dhcp4o6-port\": 0,\n"
+"        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
+"        \"expired-leases-processing\": {\n"
+"            \"flush-reclaimed-timer-wait-time\": 25,\n"
+"            \"hold-reclaimed-time\": 3600,\n"
+"            \"max-reclaim-leases\": 100,\n"
+"            \"max-reclaim-time\": 250,\n"
+"            \"reclaim-timer-wait-time\": 10,\n"
+"            \"unwarned-reclaim-cycles\": 5\n"
+"        },\n"
+"        \"hooks-libraries\": [ ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
+"        \"hostname-char-replacement\": \"\",\n"
+"        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"ip-reservations-unique\": true,\n"
+"        \"lease-database\": {\n"
+"            \"type\": \"memfile\"\n"
+"        },\n"
+"        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": true,\n"
+"            \"packet-queue-size\": 64,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
+"        \"option-def\": [ ],\n"
+"        \"parked-packet-limit\": 256,\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"reservations-global\": false,\n"
+"        \"reservations-in-subnet\": true,\n"
+"        \"reservations-lookup-first\": false,\n"
+"        \"reservations-out-of-pool\": false,\n"
+"        \"sanity-checks\": {\n"
+"            \"extended-info-checks\": \"fix\",\n"
+"            \"lease-checks\": \"warn\"\n"
+"        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
+"        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
+"        \"statistic-default-sample-age\": 0,\n"
+"        \"statistic-default-sample-count\": 20,\n"
+"        \"store-extended-info\": false,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.1.0/24\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"reservations-global\": false,\n"
+"                \"reservations-in-subnet\": true,\n"
+"                \"reservations-out-of-pool\": false,\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.1.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 2,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.0/24\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"reservations-global\": false,\n"
+"                \"reservations-in-subnet\": true,\n"
+"                \"reservations-out-of-pool\": true,\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 3,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.3.0/24\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"reservations-global\": false,\n"
+"                \"reservations-in-subnet\": false,\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 4,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.4.0/24\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"reservations-global\": true,\n"
+"                \"reservations-in-subnet\": false,\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.4.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 5,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.5.0/24\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
 "                },\n"
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
-"                \"reservations-global\": true,\n"
-"                \"reservations-in-subnet\": false,\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:4::/48\",\n"
+"                \"subnet\": \"192.0.5.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            },\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 5,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 6,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:5::/64\"\n"
+"                        \"pool\": \"192.0.6.0/24\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
 "                },\n"
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
+"                \"reservations-global\": true,\n"
+"                \"reservations-in-subnet\": true,\n"
+"                \"reservations-out-of-pool\": false,\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:5::/48\",\n"
+"                \"subnet\": \"192.0.6.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            },\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 6,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 7,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:6::/64\"\n"
+"                        \"pool\": \"192.0.7.0/24\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -7833,56 +8851,335 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"reservations\": [ ],\n"
 "                \"reservations-global\": true,\n"
 "                \"reservations-in-subnet\": true,\n"
+"                \"reservations-out-of-pool\": true,\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.7.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 49
+"{\n"
+"        \"allocator\": \"iterative\",\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
+"        \"ddns-generated-prefix\": \"myhost\",\n"
+"        \"ddns-override-client-update\": false,\n"
+"        \"ddns-override-no-update\": false,\n"
+"        \"ddns-qualifying-suffix\": \"\",\n"
+"        \"ddns-replace-client-name\": \"never\",\n"
+"        \"ddns-send-updates\": true,\n"
+"        \"ddns-update-on-renew\": false,\n"
+"        \"decline-probation-period\": 86400,\n"
+"        \"dhcp-ddns\": {\n"
+"            \"enable-updates\": false,\n"
+"            \"max-queue-size\": 1024,\n"
+"            \"ncr-format\": \"JSON\",\n"
+"            \"ncr-protocol\": \"UDP\",\n"
+"            \"sender-ip\": \"0.0.0.0\",\n"
+"            \"sender-port\": 0,\n"
+"            \"server-ip\": \"127.0.0.1\",\n"
+"            \"server-port\": 53001\n"
+"        },\n"
+"        \"dhcp-queue-control\": {\n"
+"            \"capacity\": 64,\n"
+"            \"enable-queue\": false,\n"
+"            \"queue-type\": \"kea-ring4\"\n"
+"        },\n"
+"        \"dhcp4o6-port\": 0,\n"
+"        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
+"        \"expired-leases-processing\": {\n"
+"            \"flush-reclaimed-timer-wait-time\": 25,\n"
+"            \"hold-reclaimed-time\": 3600,\n"
+"            \"max-reclaim-leases\": 100,\n"
+"            \"max-reclaim-time\": 250,\n"
+"            \"reclaim-timer-wait-time\": 10,\n"
+"            \"unwarned-reclaim-cycles\": 5\n"
+"        },\n"
+"        \"hooks-libraries\": [ ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
+"        \"hostname-char-replacement\": \"\",\n"
+"        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"ip-reservations-unique\": true,\n"
+"        \"lease-database\": {\n"
+"            \"type\": \"memfile\"\n"
+"        },\n"
+"        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": true,\n"
+"            \"packet-queue-size\": 64,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
+"        \"option-def\": [ ],\n"
+"        \"parked-packet-limit\": 256,\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
+"        \"reservations-global\": false,\n"
+"        \"reservations-in-subnet\": true,\n"
+"        \"reservations-lookup-first\": false,\n"
+"        \"reservations-out-of-pool\": true,\n"
+"        \"sanity-checks\": {\n"
+"            \"extended-info-checks\": \"fix\",\n"
+"            \"lease-checks\": \"warn\"\n"
+"        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
+"        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
+"        \"statistic-default-sample-age\": 0,\n"
+"        \"statistic-default-sample-count\": 20,\n"
+"        \"store-extended-info\": false,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.0/24\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"reservations-global\": false,\n"
+"                \"reservations-in-subnet\": true,\n"
 "                \"reservations-out-of-pool\": false,\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:6::/48\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            },\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 7,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 2,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:7::/64\"\n"
+"                        \"pool\": \"192.0.3.0/24\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
 "                },\n"
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
-"                \"reservations-global\": true,\n"
-"                \"reservations-in-subnet\": true,\n"
-"                \"reservations-out-of-pool\": true,\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:7::/48\",\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 50
+"{\n"
+"        \"allocator\": \"iterative\",\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
+"        \"ddns-generated-prefix\": \"myhost\",\n"
+"        \"ddns-override-client-update\": false,\n"
+"        \"ddns-override-no-update\": false,\n"
+"        \"ddns-qualifying-suffix\": \"\",\n"
+"        \"ddns-replace-client-name\": \"never\",\n"
+"        \"ddns-send-updates\": true,\n"
+"        \"ddns-update-on-renew\": false,\n"
+"        \"decline-probation-period\": 86400,\n"
+"        \"dhcp-ddns\": {\n"
+"            \"enable-updates\": false,\n"
+"            \"max-queue-size\": 1024,\n"
+"            \"ncr-format\": \"JSON\",\n"
+"            \"ncr-protocol\": \"UDP\",\n"
+"            \"sender-ip\": \"0.0.0.0\",\n"
+"            \"sender-port\": 0,\n"
+"            \"server-ip\": \"127.0.0.1\",\n"
+"            \"server-port\": 53001\n"
+"        },\n"
+"        \"dhcp-queue-control\": {\n"
+"            \"capacity\": 64,\n"
+"            \"enable-queue\": false,\n"
+"            \"queue-type\": \"kea-ring4\"\n"
+"        },\n"
+"        \"dhcp4o6-port\": 0,\n"
+"        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
+"        \"expired-leases-processing\": {\n"
+"            \"flush-reclaimed-timer-wait-time\": 25,\n"
+"            \"hold-reclaimed-time\": 3600,\n"
+"            \"max-reclaim-leases\": 100,\n"
+"            \"max-reclaim-time\": 250,\n"
+"            \"reclaim-timer-wait-time\": 10,\n"
+"            \"unwarned-reclaim-cycles\": 5\n"
+"        },\n"
+"        \"hooks-libraries\": [ ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
+"        \"hostname-char-replacement\": \"\",\n"
+"        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"ip-reservations-unique\": true,\n"
+"        \"lease-database\": {\n"
+"            \"type\": \"memfile\"\n"
+"        },\n"
+"        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": true,\n"
+"            \"packet-queue-size\": 64,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
+"        \"option-def\": [ ],\n"
+"        \"parked-packet-limit\": 256,\n"
+"        \"reservations-global\": false,\n"
+"        \"reservations-in-subnet\": true,\n"
+"        \"reservations-lookup-first\": false,\n"
+"        \"reservations-out-of-pool\": false,\n"
+"        \"sanity-checks\": {\n"
+"            \"extended-info-checks\": \"fix\",\n"
+"            \"lease-checks\": \"warn\"\n"
+"        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
+"        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
+"        \"statistic-default-sample-age\": 0,\n"
+"        \"statistic-default-sample-count\": 20,\n"
+"        \"store-extended-info\": false,\n"
+"        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
+"    }\n",
+    // CONFIGURATION 51
+"{\n"
+"        \"allocator\": \"iterative\",\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
+"        \"ddns-generated-prefix\": \"myhost\",\n"
+"        \"ddns-override-client-update\": false,\n"
+"        \"ddns-override-no-update\": false,\n"
+"        \"ddns-qualifying-suffix\": \"\",\n"
+"        \"ddns-replace-client-name\": \"never\",\n"
+"        \"ddns-send-updates\": true,\n"
+"        \"ddns-update-on-renew\": false,\n"
+"        \"decline-probation-period\": 86400,\n"
+"        \"dhcp-ddns\": {\n"
+"            \"enable-updates\": false,\n"
+"            \"max-queue-size\": 1024,\n"
+"            \"ncr-format\": \"JSON\",\n"
+"            \"ncr-protocol\": \"UDP\",\n"
+"            \"sender-ip\": \"0.0.0.0\",\n"
+"            \"sender-port\": 0,\n"
+"            \"server-ip\": \"127.0.0.1\",\n"
+"            \"server-port\": 53001\n"
+"        },\n"
+"        \"dhcp-queue-control\": {\n"
+"            \"capacity\": 64,\n"
+"            \"enable-queue\": false,\n"
+"            \"queue-type\": \"kea-ring4\"\n"
+"        },\n"
+"        \"dhcp4o6-port\": 0,\n"
+"        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
+"        \"expired-leases-processing\": {\n"
+"            \"flush-reclaimed-timer-wait-time\": 25,\n"
+"            \"hold-reclaimed-time\": 3600,\n"
+"            \"max-reclaim-leases\": 100,\n"
+"            \"max-reclaim-time\": 250,\n"
+"            \"reclaim-timer-wait-time\": 10,\n"
+"            \"unwarned-reclaim-cycles\": 5\n"
+"        },\n"
+"        \"hooks-libraries\": [ ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
+"        \"hostname-char-replacement\": \"\",\n"
+"        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"ip-reservations-unique\": true,\n"
+"        \"lease-database\": {\n"
+"            \"type\": \"memfile\"\n"
+"        },\n"
+"        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": true,\n"
+"            \"packet-queue-size\": 64,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
+"        \"option-def\": [ ],\n"
+"        \"parked-packet-limit\": 256,\n"
+"        \"reservations-global\": false,\n"
+"        \"reservations-in-subnet\": true,\n"
+"        \"reservations-lookup-first\": false,\n"
+"        \"reservations-out-of-pool\": false,\n"
+"        \"sanity-checks\": {\n"
+"            \"extended-info-checks\": \"fix\",\n"
+"            \"lease-checks\": \"warn\"\n"
+"        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
+"        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
+"        \"statistic-default-sample-age\": 0,\n"
+"        \"statistic-default-sample-count\": 20,\n"
+"        \"store-extended-info\": false,\n"
+"        \"subnet4\": [ ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 41
+    // CONFIGURATION 52
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -7891,7 +9188,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"ddns-replace-client-name\": \"never\",\n"
 "        \"ddns-send-updates\": true,\n"
 "        \"ddns-update-on-renew\": false,\n"
-"        \"decline-probation-period\": 86400,\n"
+"        \"decline-probation-period\": 12345,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
 "            \"max-queue-size\": 1024,\n"
@@ -7905,10 +9202,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -7918,127 +9216,53 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
-"            \"interfaces\": [ ],\n"
+"            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
 "        \"ip-reservations-unique\": true,\n"
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
-"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
-"        \"reservations-out-of-pool\": true,\n"
+"        \"reservations-out-of-pool\": false,\n"
 "        \"sanity-checks\": {\n"
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/64\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"reservations-global\": false,\n"
-"                \"reservations-in-subnet\": true,\n"
-"                \"reservations-out-of-pool\": false,\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/48\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            },\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 2,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:2::/64\"\n"
-"                    }\n"
-"                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:2::/48\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            }\n"
-"        ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 42
+    // CONFIGURATION 53
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -8061,20 +9285,21 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
-"            \"flush-reclaimed-timer-wait-time\": 25,\n"
-"            \"hold-reclaimed-time\": 3600,\n"
-"            \"max-reclaim-leases\": 100,\n"
-"            \"max-reclaim-time\": 250,\n"
-"            \"reclaim-timer-wait-time\": 10,\n"
-"            \"unwarned-reclaim-cycles\": 5\n"
+"            \"flush-reclaimed-timer-wait-time\": 35,\n"
+"            \"hold-reclaimed-time\": 1800,\n"
+"            \"max-reclaim-leases\": 50,\n"
+"            \"max-reclaim-time\": 100,\n"
+"            \"reclaim-timer-wait-time\": 20,\n"
+"            \"unwarned-reclaim-cycles\": 10\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -8085,20 +9310,16 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"23\", \"37\", \"65\" ],\n"
-"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -8107,28 +9328,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 43
+    // CONFIGURATION 54
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -8151,10 +9368,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -8164,7 +9382,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -8175,17 +9393,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -8194,28 +9413,53 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 7200\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 44
+    // CONFIGURATION 55
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -8238,10 +9482,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -8251,7 +9496,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -8262,17 +9507,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -8281,28 +9527,53 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"2001:db8::123/45\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 7200\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 45
+    // CONFIGURATION 56
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -8311,7 +9582,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"ddns-replace-client-name\": \"never\",\n"
 "        \"ddns-send-updates\": true,\n"
 "        \"ddns-update-on-renew\": false,\n"
-"        \"decline-probation-period\": 12345,\n"
+"        \"decline-probation-period\": 86400,\n"
 "        \"dhcp-ddns\": {\n"
 "            \"enable-updates\": false,\n"
 "            \"max-queue-size\": 1024,\n"
@@ -8325,10 +9596,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -8338,7 +9610,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -8349,17 +9621,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -8368,28 +9641,53 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"ethX\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 7200\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 46
+    // CONFIGURATION 57
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -8412,20 +9710,21 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
-"            \"flush-reclaimed-timer-wait-time\": 35,\n"
-"            \"hold-reclaimed-time\": 1800,\n"
-"            \"max-reclaim-leases\": 50,\n"
-"            \"max-reclaim-time\": 100,\n"
-"            \"reclaim-timer-wait-time\": 20,\n"
-"            \"unwarned-reclaim-cycles\": 10\n"
+"            \"flush-reclaimed-timer-wait-time\": 25,\n"
+"            \"hold-reclaimed-time\": 3600,\n"
+"            \"max-reclaim-leases\": 100,\n"
+"            \"max-reclaim-time\": 250,\n"
+"            \"reclaim-timer-wait-time\": 10,\n"
+"            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -8436,17 +9735,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -8455,42 +9755,53 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"ethX\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"2001:db8::543/21\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 7200\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 47
+    // CONFIGURATION 58
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
-"        \"client-classes\": [\n"
-"            {\n"
-"                \"name\": \"one\",\n"
-"                \"option-data\": [ ]\n"
-"            },\n"
-"            {\n"
-"                \"name\": \"two\",\n"
-"                \"option-data\": [ ]\n"
-"            },\n"
-"            {\n"
-"                \"name\": \"three\",\n"
-"                \"option-data\": [ ]\n"
-"            }\n"
-"        ],\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -8513,10 +9824,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -8526,7 +9838,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -8537,19 +9849,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -8559,39 +9869,30 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"vlan123\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::1-2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -8599,20 +9900,48 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 48
+    // CONFIGURATION 59
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"client-classes\": [\n"
+"            {\n"
+"                \"boot-file-name\": \"\",\n"
+"                \"name\": \"one\",\n"
+"                \"next-server\": \"0.0.0.0\",\n"
+"                \"option-data\": [ ],\n"
+"                \"option-def\": [ ],\n"
+"                \"server-hostname\": \"\"\n"
+"            },\n"
+"            {\n"
+"                \"boot-file-name\": \"\",\n"
+"                \"name\": \"two\",\n"
+"                \"next-server\": \"0.0.0.0\",\n"
+"                \"option-data\": [ ],\n"
+"                \"option-def\": [ ],\n"
+"                \"server-hostname\": \"\"\n"
+"            },\n"
+"            {\n"
+"                \"boot-file-name\": \"\",\n"
+"                \"name\": \"three\",\n"
+"                \"next-server\": \"0.0.0.0\",\n"
+"                \"option-data\": [ ],\n"
+"                \"option-def\": [ ],\n"
+"                \"server-hostname\": \"\"\n"
+"            }\n"
+"        ],\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -8635,10 +9964,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -8648,7 +9978,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -8659,19 +9989,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -8681,39 +10009,30 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8::/64\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -8721,20 +10040,43 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8::/32\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 49
+    // CONFIGURATION 60
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"client-classes\": [\n"
+"            {\n"
+"                \"boot-file-name\": \"\",\n"
+"                \"max-valid-lifetime\": 3000,\n"
+"                \"min-valid-lifetime\": 1000,\n"
+"                \"name\": \"one\",\n"
+"                \"next-server\": \"0.0.0.0\",\n"
+"                \"option-data\": [ ],\n"
+"                \"option-def\": [ ],\n"
+"                \"server-hostname\": \"\",\n"
+"                \"valid-lifetime\": 2000\n"
+"            },\n"
+"            {\n"
+"                \"boot-file-name\": \"\",\n"
+"                \"name\": \"two\",\n"
+"                \"next-server\": \"0.0.0.0\",\n"
+"                \"option-data\": [ ],\n"
+"                \"option-def\": [ ],\n"
+"                \"server-hostname\": \"\"\n"
+"            }\n"
+"        ],\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -8757,10 +10099,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -8770,7 +10113,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -8781,20 +10124,16 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
-"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -8803,61 +10142,74 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
+"                \"max-valid-lifetime\": 7200,\n"
+"                \"min-valid-lifetime\": 7200,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8::/64\",\n"
-"                        \"user-context\": { }\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
 "                },\n"
-"                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8::/32\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 7200\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 50
+    // CONFIGURATION 61
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"client-classes\": [\n"
+"            {\n"
+"                \"boot-file-name\": \"\",\n"
+"                \"max-valid-lifetime\": 3000,\n"
+"                \"min-valid-lifetime\": 1000,\n"
+"                \"name\": \"one\",\n"
+"                \"next-server\": \"0.0.0.0\",\n"
+"                \"option-data\": [ ],\n"
+"                \"option-def\": [ ],\n"
+"                \"server-hostname\": \"\",\n"
+"                \"template-test\": \"''\",\n"
+"                \"valid-lifetime\": 2000\n"
+"            },\n"
+"            {\n"
+"                \"boot-file-name\": \"\",\n"
+"                \"name\": \"two\",\n"
+"                \"next-server\": \"0.0.0.0\",\n"
+"                \"option-data\": [ ],\n"
+"                \"option-def\": [ ],\n"
+"                \"server-hostname\": \"\",\n"
+"                \"template-test\": \"''\"\n"
+"            }\n"
+"        ],\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -8880,10 +10232,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -8893,7 +10246,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -8904,20 +10257,16 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
-"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -8926,66 +10275,51 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
+"                \"max-valid-lifetime\": 7200,\n"
+"                \"min-valid-lifetime\": 7200,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8::/64\",\n"
-"                        \"user-context\": {\n"
-"                            \"lw4over6-bind-prefix-len\": 56,\n"
-"                            \"lw4over6-sharing-ratio\": 64,\n"
-"                            \"lw4over6-sysports-exclude\": true,\n"
-"                            \"lw4over6-v4-pool\": \"192.0.2.0/24\"\n"
-"                        }\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
 "                },\n"
-"                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8::/32\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 7200\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 51
+    // CONFIGURATION 62
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -9008,10 +10342,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -9021,7 +10356,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -9032,19 +10367,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -9054,45 +10387,30 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8::/64\",\n"
-"                        \"user-context\": {\n"
-"                            \"lw4over6-bind-prefix-len\": 56,\n"
-"                            \"lw4over6-sharing-ratio\": 64,\n"
-"                            \"lw4over6-sysports-exclude\": true,\n"
-"                            \"lw4over6-v4-pool\": \"192.0.2.0/24\"\n"
-"                        }\n"
+"                        \"pool\": \"192.0.2.0/28\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -9100,20 +10418,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8::/32\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 52
+    // CONFIGURATION 63
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -9136,10 +10456,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -9149,7 +10470,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -9160,19 +10481,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -9182,41 +10501,31 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 64,\n"
 "                        \"option-data\": [ ],\n"
-"                        \"prefix\": \"2001:db8::\",\n"
-"                        \"prefix-len\": 56\n"
+"                        \"pool\": \"192.0.2.0/28\",\n"
+"                        \"user-context\": { }\n"
 "                    }\n"
 "                ],\n"
-"                \"pools\": [ ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -9224,20 +10533,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8::/32\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 53
+    // CONFIGURATION 64
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -9260,10 +10571,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -9273,7 +10585,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -9284,19 +10596,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -9306,42 +10616,35 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 64,\n"
 "                        \"option-data\": [ ],\n"
-"                        \"prefix\": \"2001:db8::\",\n"
-"                        \"prefix-len\": 56,\n"
-"                        \"user-context\": { }\n"
+"                        \"pool\": \"192.0.2.0/28\",\n"
+"                        \"user-context\": {\n"
+"                            \"bool-param\": true,\n"
+"                            \"integer-param\": 42,\n"
+"                            \"string-param\": \"Sagittarius\"\n"
+"                        }\n"
 "                    }\n"
 "                ],\n"
-"                \"pools\": [ ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -9349,20 +10652,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8::/32\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 54
+    // CONFIGURATION 65
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -9385,10 +10690,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -9398,7 +10704,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -9409,19 +10715,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -9431,47 +10735,35 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 1,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [\n"
+"                \"pools\": [\n"
 "                    {\n"
-"                        \"delegated-len\": 64,\n"
 "                        \"option-data\": [ ],\n"
-"                        \"prefix\": \"2001:db8::\",\n"
-"                        \"prefix-len\": 56,\n"
+"                        \"pool\": \"192.0.2.0/28\",\n"
 "                        \"user-context\": {\n"
-"                            \"lw4over6-bind-prefix-len\": 56,\n"
-"                            \"lw4over6-sharing-ratio\": 64,\n"
-"                            \"lw4over6-sysports-exclude\": true,\n"
-"                            \"lw4over6-v4-pool\": \"192.0.2.0/24\"\n"
+"                            \"bool-param\": true,\n"
+"                            \"integer-param\": 42,\n"
+"                            \"string-param\": \"Sagittarius\"\n"
 "                        }\n"
 "                    }\n"
 "                ],\n"
-"                \"pools\": [ ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -9479,20 +10771,22 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8::/32\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 55
+    // CONFIGURATION 66
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -9515,10 +10809,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -9528,7 +10823,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"hosts-databases\": [\n"
@@ -9553,19 +10848,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -9575,44 +10868,52 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 56
+    // CONFIGURATION 67
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"client-classes\": [\n"
 "            {\n"
+"                \"boot-file-name\": \"\",\n"
 "                \"name\": \"all\",\n"
+"                \"next-server\": \"0.0.0.0\",\n"
 "                \"option-data\": [ ],\n"
+"                \"option-def\": [ ],\n"
+"                \"server-hostname\": \"\",\n"
 "                \"test\": \"'' == ''\",\n"
 "                \"user-context\": {\n"
 "                    \"comment\": \"match all\"\n"
 "                }\n"
 "            },\n"
 "            {\n"
+"                \"boot-file-name\": \"\",\n"
 "                \"name\": \"none\",\n"
-"                \"option-data\": [ ]\n"
+"                \"next-server\": \"0.0.0.0\",\n"
+"                \"option-data\": [ ],\n"
+"                \"option-def\": [ ],\n"
+"                \"server-hostname\": \"\"\n"
 "            },\n"
 "            {\n"
+"                \"boot-file-name\": \"\",\n"
 "                \"name\": \"both\",\n"
+"                \"next-server\": \"0.0.0.0\",\n"
 "                \"option-data\": [ ],\n"
+"                \"option-def\": [ ],\n"
+"                \"server-hostname\": \"\",\n"
 "                \"user-context\": {\n"
 "                    \"comment\": \"a comment\",\n"
 "                    \"version\": 1\n"
@@ -9621,7 +10922,7 @@ const char* UNPARSED_CONFIGS[] = {
 "        ],\n"
 "        \"control-sockets\": [\n"
 "            {\n"
-"                \"socket-name\": \"/tmp/kea6-ctrl-socket\",\n"
+"                \"socket-name\": \"/tmp/kea4-ctrl-socket\",\n"
 "                \"socket-type\": \"unix\",\n"
 "                \"user-context\": {\n"
 "                    \"comment\": \"Indirect comment\"\n"
@@ -9639,13 +10940,13 @@ const char* UNPARSED_CONFIGS[] = {
 "                        }\n"
 "                    ],\n"
 "                    \"directory\": \"\",\n"
-"                    \"realm\": \"\",\n"
+"                    \"realm\": \"kea-dhcpv4-server\",\n"
 "                    \"type\": \"basic\",\n"
 "                    \"user-context\": {\n"
 "                        \"comment\": \"basic HTTP authentication\"\n"
 "                    }\n"
 "                },\n"
-"                \"socket-address\": \"127.0.0.1\",\n"
+"                \"socket-address\": \"::1\",\n"
 "                \"socket-port\": 8000,\n"
 "                \"socket-type\": \"http\",\n"
 "                \"user-context\": {\n"
@@ -9678,10 +10979,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -9691,7 +10993,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -9705,21 +11007,22 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
-"                \"code\": 38,\n"
+"                \"code\": 56,\n"
 "                \"csv-format\": false,\n"
 "                \"data\": \"ABCDEF0105\",\n"
-"                \"name\": \"subscriber-id\",\n"
+"                \"name\": \"dhcp-message\",\n"
 "                \"never-send\": false,\n"
-"                \"space\": \"dhcp6\",\n"
+"                \"space\": \"dhcp4\",\n"
 "                \"user-context\": {\n"
 "                    \"comment\": \"Set option value\"\n"
 "                }\n"
@@ -9733,15 +11036,13 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"name\": \"foo\",\n"
 "                \"record-types\": \"\",\n"
 "                \"space\": \"isc\",\n"
-"                \"type\": \"ipv6-address\",\n"
+"                \"type\": \"ipv4-address\",\n"
 "                \"user-context\": {\n"
 "                    \"comment\": \"An option definition\"\n"
 "                }\n"
 "            }\n"
 "        ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -9750,56 +11051,35 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LL\",\n"
-"            \"user-context\": {\n"
-"                \"comment\": \"DHCPv6 specific\"\n"
-"            }\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [\n"
 "            {\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"max-valid-lifetime\": 7200,\n"
 "                \"min-valid-lifetime\": 7200,\n"
 "                \"name\": \"foo\",\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"rapid-commit\": false,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
 "                },\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet6\": [\n"
+"                \"subnet4\": [\n"
 "                    {\n"
+"                        \"4o6-interface\": \"\",\n"
+"                        \"4o6-interface-id\": \"\",\n"
+"                        \"4o6-subnet\": \"\",\n"
 "                        \"allocator\": \"iterative\",\n"
-"                        \"calculate-tee-times\": true,\n"
+"                        \"calculate-tee-times\": false,\n"
 "                        \"id\": 100,\n"
 "                        \"max-valid-lifetime\": 7200,\n"
 "                        \"min-valid-lifetime\": 7200,\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pd-allocator\": \"iterative\",\n"
-"                        \"pd-pools\": [\n"
-"                            {\n"
-"                                \"delegated-len\": 64,\n"
-"                                \"option-data\": [ ],\n"
-"                                \"prefix\": \"2001:db2::\",\n"
-"                                \"prefix-len\": 48,\n"
-"                                \"user-context\": {\n"
-"                                    \"comment\": \"A prefix pool\"\n"
-"                                }\n"
-"                            }\n"
-"                        ],\n"
 "                        \"pools\": [\n"
 "                            {\n"
 "                                \"option-data\": [ ],\n"
-"                                \"pool\": \"2001:db1::/64\",\n"
+"                                \"pool\": \"192.0.1.1-192.0.1.10\",\n"
 "                                \"user-context\": {\n"
 "                                    \"comment\": \"A pool\"\n"
 "                                }\n"
@@ -9810,34 +11090,35 @@ const char* UNPARSED_CONFIGS[] = {
 "                        },\n"
 "                        \"reservations\": [\n"
 "                            {\n"
+"                                \"boot-file-name\": \"\",\n"
 "                                \"client-classes\": [ ],\n"
 "                                \"hostname\": \"foo.example.com\",\n"
 "                                \"hw-address\": \"aa:bb:cc:dd:ee:ff\",\n"
-"                                \"ip-addresses\": [ ],\n"
+"                                \"next-server\": \"0.0.0.0\",\n"
 "                                \"option-data\": [\n"
 "                                    {\n"
 "                                        \"always-send\": false,\n"
-"                                        \"code\": 24,\n"
+"                                        \"code\": 15,\n"
 "                                        \"csv-format\": true,\n"
 "                                        \"data\": \"example.com\",\n"
-"                                        \"name\": \"domain-search\",\n"
+"                                        \"name\": \"domain-name\",\n"
 "                                        \"never-send\": false,\n"
-"                                        \"space\": \"dhcp6\",\n"
+"                                        \"space\": \"dhcp4\",\n"
 "                                        \"user-context\": {\n"
 "                                            \"comment\": \"An option in a reservation\"\n"
 "                                        }\n"
 "                                    }\n"
 "                                ],\n"
-"                                \"prefixes\": [ ],\n"
+"                                \"server-hostname\": \"\",\n"
 "                                \"user-context\": {\n"
 "                                    \"comment\": \"A host reservation\"\n"
 "                                }\n"
 "                            }\n"
 "                        ],\n"
 "                        \"store-extended-info\": false,\n"
-"                        \"subnet\": \"2001:db1::/48\",\n"
+"                        \"subnet\": \"192.0.1.0/24\",\n"
 "                        \"t1-percent\": 0.5,\n"
-"                        \"t2-percent\": 0.8,\n"
+"                        \"t2-percent\": 0.875,\n"
 "                        \"user-context\": {\n"
 "                            \"comment\": \"A subnet\"\n"
 "                        },\n"
@@ -9845,28 +11126,31 @@ const char* UNPARSED_CONFIGS[] = {
 "                    }\n"
 "                ],\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"user-context\": {\n"
 "                    \"comment\": \"A shared network\"\n"
 "                },\n"
 "                \"valid-lifetime\": 7200\n"
 "            }\n"
 "        ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"user-context\": {\n"
-"            \"comment\": \"A DHCPv6 server\"\n"
+"            \"comment\": \"A DHCPv4 server\"\n"
 "        },\n"
 "        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 57
+    // CONFIGURATION 68
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -9889,10 +11173,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -9902,7 +11187,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -9913,190 +11198,340 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations\": [\n"
 "            {\n"
+"                \"boot-file-name\": \"\",\n"
 "                \"client-classes\": [ ],\n"
-"                \"hostname\": \"\",\n"
+"                \"hostname\": \"global2\",\n"
 "                \"hw-address\": \"01:02:03:04:05:06\",\n"
-"                \"ip-addresses\": [ \"2001:db8:2::abcd\" ],\n"
+"                \"next-server\": \"0.0.0.0\",\n"
 "                \"option-data\": [\n"
 "                    {\n"
 "                        \"always-send\": false,\n"
-"                        \"code\": 23,\n"
+"                        \"code\": 5,\n"
 "                        \"csv-format\": true,\n"
-"                        \"data\": \"2001:db8:2::abbc\",\n"
-"                        \"name\": \"dns-servers\",\n"
+"                        \"data\": \"192.0.3.95\",\n"
+"                        \"name\": \"name-servers\",\n"
 "                        \"never-send\": false,\n"
-"                        \"space\": \"dhcp6\"\n"
+"                        \"space\": \"dhcp4\"\n"
 "                    },\n"
 "                    {\n"
 "                        \"always-send\": false,\n"
-"                        \"code\": 7,\n"
+"                        \"code\": 23,\n"
 "                        \"csv-format\": true,\n"
-"                        \"data\": \"25\",\n"
-"                        \"name\": \"preference\",\n"
+"                        \"data\": \"11\",\n"
+"                        \"name\": \"default-ip-ttl\",\n"
 "                        \"never-send\": false,\n"
-"                        \"space\": \"dhcp6\"\n"
+"                        \"space\": \"dhcp4\"\n"
 "                    }\n"
 "                ],\n"
-"                \"prefixes\": [ ]\n"
+"                \"server-hostname\": \"\"\n"
 "            },\n"
 "            {\n"
+"                \"boot-file-name\": \"\",\n"
 "                \"client-classes\": [ ],\n"
 "                \"duid\": \"01:02:03:04:05:06:07:08:09:0a\",\n"
-"                \"hostname\": \"\",\n"
-"                \"ip-addresses\": [ \"2001:db8:2::1234\" ],\n"
+"                \"hostname\": \"global1\",\n"
+"                \"ip-address\": \"192.0.200.1\",\n"
+"                \"next-server\": \"0.0.0.0\",\n"
 "                \"option-data\": [\n"
 "                    {\n"
 "                        \"always-send\": false,\n"
-"                        \"code\": 23,\n"
+"                        \"code\": 5,\n"
 "                        \"csv-format\": true,\n"
-"                        \"data\": \"2001:db8:2::1111\",\n"
-"                        \"name\": \"dns-servers\",\n"
+"                        \"data\": \"192.0.3.15\",\n"
+"                        \"name\": \"name-servers\",\n"
 "                        \"never-send\": false,\n"
-"                        \"space\": \"dhcp6\"\n"
+"                        \"space\": \"dhcp4\"\n"
 "                    },\n"
 "                    {\n"
 "                        \"always-send\": false,\n"
-"                        \"code\": 7,\n"
+"                        \"code\": 23,\n"
 "                        \"csv-format\": true,\n"
-"                        \"data\": \"11\",\n"
-"                        \"name\": \"preference\",\n"
+"                        \"data\": \"32\",\n"
+"                        \"name\": \"default-ip-ttl\",\n"
 "                        \"never-send\": false,\n"
-"                        \"space\": \"dhcp6\"\n"
+"                        \"space\": \"dhcp4\"\n"
+"                    }\n"
+"                ],\n"
+"                \"server-hostname\": \"\"\n"
+"            }\n"
+"        ],\n"
+"        \"reservations-global\": false,\n"
+"        \"reservations-in-subnet\": true,\n"
+"        \"reservations-lookup-first\": false,\n"
+"        \"reservations-out-of-pool\": false,\n"
+"        \"sanity-checks\": {\n"
+"            \"extended-info-checks\": \"fix\",\n"
+"            \"lease-checks\": \"warn\"\n"
+"        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
+"        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
+"        \"statistic-default-sample-age\": 0,\n"
+"        \"statistic-default-sample-count\": 20,\n"
+"        \"store-extended-info\": false,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 123,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 542,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.4.101-192.0.4.150\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.4.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
+"        \"t1-percent\": 0.5,\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
+"    }\n",
+    // CONFIGURATION 69
+"{\n"
+"        \"allocator\": \"iterative\",\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
+"        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
+"        \"ddns-generated-prefix\": \"myhost\",\n"
+"        \"ddns-override-client-update\": false,\n"
+"        \"ddns-override-no-update\": false,\n"
+"        \"ddns-qualifying-suffix\": \"\",\n"
+"        \"ddns-replace-client-name\": \"never\",\n"
+"        \"ddns-send-updates\": true,\n"
+"        \"ddns-update-on-renew\": false,\n"
+"        \"decline-probation-period\": 86400,\n"
+"        \"dhcp-ddns\": {\n"
+"            \"enable-updates\": false,\n"
+"            \"max-queue-size\": 1024,\n"
+"            \"ncr-format\": \"JSON\",\n"
+"            \"ncr-protocol\": \"UDP\",\n"
+"            \"sender-ip\": \"0.0.0.0\",\n"
+"            \"sender-port\": 0,\n"
+"            \"server-ip\": \"127.0.0.1\",\n"
+"            \"server-port\": 53001\n"
+"        },\n"
+"        \"dhcp-queue-control\": {\n"
+"            \"capacity\": 64,\n"
+"            \"enable-queue\": false,\n"
+"            \"queue-type\": \"kea-ring4\"\n"
+"        },\n"
+"        \"dhcp4o6-port\": 0,\n"
+"        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
+"        \"expired-leases-processing\": {\n"
+"            \"flush-reclaimed-timer-wait-time\": 25,\n"
+"            \"hold-reclaimed-time\": 3600,\n"
+"            \"max-reclaim-leases\": 100,\n"
+"            \"max-reclaim-time\": 250,\n"
+"            \"reclaim-timer-wait-time\": 10,\n"
+"            \"unwarned-reclaim-cycles\": 5\n"
+"        },\n"
+"        \"hooks-libraries\": [ ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
+"        \"hostname-char-replacement\": \"\",\n"
+"        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
+"        \"interfaces-config\": {\n"
+"            \"interfaces\": [ \"*\" ],\n"
+"            \"re-detect\": false\n"
+"        },\n"
+"        \"ip-reservations-unique\": true,\n"
+"        \"lease-database\": {\n"
+"            \"type\": \"memfile\"\n"
+"        },\n"
+"        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": true,\n"
+"            \"packet-queue-size\": 64,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
+"        \"option-data\": [ ],\n"
+"        \"option-def\": [ ],\n"
+"        \"parked-packet-limit\": 256,\n"
+"        \"reservations-global\": false,\n"
+"        \"reservations-in-subnet\": true,\n"
+"        \"reservations-lookup-first\": false,\n"
+"        \"reservations-out-of-pool\": false,\n"
+"        \"sanity-checks\": {\n"
+"            \"extended-info-checks\": \"fix\",\n"
+"            \"lease-checks\": \"warn\"\n"
+"        },\n"
+"        \"server-hostname\": \"\",\n"
+"        \"server-tag\": \"\",\n"
+"        \"shared-networks\": [\n"
+"            {\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": true,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"name\": \"foo\",\n"
+"                \"option-data\": [ ],\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet4\": [\n"
+"                    {\n"
+"                        \"4o6-interface\": \"\",\n"
+"                        \"4o6-interface-id\": \"\",\n"
+"                        \"4o6-subnet\": \"\",\n"
+"                        \"allocator\": \"iterative\",\n"
+"                        \"calculate-tee-times\": false,\n"
+"                        \"id\": 100,\n"
+"                        \"max-valid-lifetime\": 4000,\n"
+"                        \"min-valid-lifetime\": 4000,\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pools\": [\n"
+"                            {\n"
+"                                \"option-data\": [ ],\n"
+"                                \"pool\": \"192.0.1.1-192.0.1.10\"\n"
+"                            }\n"
+"                        ],\n"
+"                        \"relay\": {\n"
+"                            \"ip-addresses\": [ ]\n"
+"                        },\n"
+"                        \"reservations\": [ ],\n"
+"                        \"store-extended-info\": false,\n"
+"                        \"subnet\": \"192.0.1.0/24\",\n"
+"                        \"t1-percent\": 0.45,\n"
+"                        \"t2-percent\": 0.65,\n"
+"                        \"valid-lifetime\": 4000\n"
+"                    },\n"
+"                    {\n"
+"                        \"4o6-interface\": \"\",\n"
+"                        \"4o6-interface-id\": \"\",\n"
+"                        \"4o6-subnet\": \"\",\n"
+"                        \"allocator\": \"iterative\",\n"
+"                        \"calculate-tee-times\": true,\n"
+"                        \"id\": 200,\n"
+"                        \"max-valid-lifetime\": 4000,\n"
+"                        \"min-valid-lifetime\": 4000,\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pools\": [\n"
+"                            {\n"
+"                                \"option-data\": [ ],\n"
+"                                \"pool\": \"192.0.2.1-192.0.2.10\"\n"
+"                            }\n"
+"                        ],\n"
+"                        \"relay\": {\n"
+"                            \"ip-addresses\": [ ]\n"
+"                        },\n"
+"                        \"reservations\": [ ],\n"
+"                        \"store-extended-info\": false,\n"
+"                        \"subnet\": \"192.0.2.0/24\",\n"
+"                        \"t1-percent\": 0.4,\n"
+"                        \"t2-percent\": 0.75,\n"
+"                        \"valid-lifetime\": 4000\n"
 "                    }\n"
 "                ],\n"
-"                \"prefixes\": [ ]\n"
+"                \"t1-percent\": 0.4,\n"
+"                \"t2-percent\": 0.75,\n"
+"                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
-"        \"reservations-global\": false,\n"
-"        \"reservations-in-subnet\": true,\n"
-"        \"reservations-lookup-first\": false,\n"
-"        \"reservations-out-of-pool\": false,\n"
-"        \"sanity-checks\": {\n"
-"            \"extended-info-checks\": \"fix\",\n"
-"            \"lease-checks\": \"warn\"\n"
-"        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
-"        \"server-tag\": \"\",\n"
-"        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 123,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 300,\n"
 "                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::/80\"\n"
+"                        \"pool\": \"192.0.3.0/28\"\n"
 "                    }\n"
 "                ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            },\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 234,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [ ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"renew-timer\": 1000,\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:2::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 4000\n"
-"            },\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 542,\n"
-"                \"max-preferred-lifetime\": 3000,\n"
-"                \"max-valid-lifetime\": 4000,\n"
-"                \"min-preferred-lifetime\": 3000,\n"
-"                \"min-valid-lifetime\": 4000,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [ ],\n"
-"                \"preferred-lifetime\": 3000,\n"
-"                \"rapid-commit\": false,\n"
-"                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
 "                },\n"
-"                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:3::/64\",\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 58
+    // CONFIGURATION 70
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -10119,10 +11554,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -10132,7 +11568,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -10143,19 +11579,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"preferred-lifetime\": 3000,\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -10165,28 +11599,81 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 5,\n"
-"        \"statistic-default-sample-count\": 10,\n"
+"        \"stash-agent-options\": false,\n"
+"        \"statistic-default-sample-age\": 0,\n"
+"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": true,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 2,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.3.1-192.0.3.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 59
+    // CONFIGURATION 71
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -10209,10 +11696,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -10222,7 +11710,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -10233,17 +11721,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -10252,28 +11741,81 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
-"        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"store-extended-info\": true,\n"
+"        \"subnet4\": [\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 1,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": false,\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            },\n"
+"            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
+"                \"allocator\": \"iterative\",\n"
+"                \"calculate-tee-times\": false,\n"
+"                \"id\": 2,\n"
+"                \"max-valid-lifetime\": 4000,\n"
+"                \"min-valid-lifetime\": 4000,\n"
+"                \"option-data\": [ ],\n"
+"                \"pools\": [\n"
+"                    {\n"
+"                        \"option-data\": [ ],\n"
+"                        \"pool\": \"192.0.3.1-192.0.3.100\"\n"
+"                    }\n"
+"                ],\n"
+"                \"rebind-timer\": 2000,\n"
+"                \"relay\": {\n"
+"                    \"ip-addresses\": [ ]\n"
+"                },\n"
+"                \"renew-timer\": 1000,\n"
+"                \"reservations\": [ ],\n"
+"                \"store-extended-info\": true,\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
+"                \"t1-percent\": 0.5,\n"
+"                \"t2-percent\": 0.875,\n"
+"                \"valid-lifetime\": 4000\n"
+"            }\n"
+"        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 7200\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 60
+    // CONFIGURATION 72
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -10296,10 +11838,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -10309,7 +11852,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -10320,17 +11863,18 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
-"            \"packet-queue-size\": 1024,\n"
-"            \"thread-pool-size\": 48\n"
+"            \"packet-queue-size\": 64,\n"
+"            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
+"        \"rebind-timer\": 2000,\n"
+"        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -10339,44 +11883,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
+"        \"stash-agent-options\": false,\n"
+"        \"statistic-default-sample-age\": 5,\n"
+"        \"statistic-default-sample-count\": 10,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [ ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 7200\n"
+"        \"t2-percent\": 0.875,\n"
+"        \"valid-lifetime\": 4000\n"
 "    }\n",
-    // CONFIGURATION 61
+    // CONFIGURATION 73
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
-"        \"client-classes\": [\n"
-"            {\n"
-"                \"max-preferred-lifetime\": 6000,\n"
-"                \"max-valid-lifetime\": 3000,\n"
-"                \"min-preferred-lifetime\": 4000,\n"
-"                \"min-valid-lifetime\": 1000,\n"
-"                \"name\": \"one\",\n"
-"                \"option-data\": [ ],\n"
-"                \"preferred-lifetime\": 5000,\n"
-"                \"valid-lifetime\": 2000\n"
-"            },\n"
-"            {\n"
-"                \"name\": \"two\",\n"
-"                \"option-data\": [ ]\n"
-"            }\n"
-"        ],\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -10399,10 +11923,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -10412,7 +11937,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -10423,17 +11948,16 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -10442,73 +11966,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 1,\n"
-"                \"max-valid-lifetime\": 7200,\n"
-"                \"min-valid-lifetime\": 7200,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::1-2001:db8:1::ffff\"\n"
-"                    }\n"
-"                ],\n"
-"                \"rapid-commit\": false,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 7200\n"
-"            }\n"
-"        ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 62
+    // CONFIGURATION 74
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
-"        \"client-classes\": [\n"
-"            {\n"
-"                \"max-preferred-lifetime\": 6000,\n"
-"                \"max-valid-lifetime\": 3000,\n"
-"                \"min-preferred-lifetime\": 4000,\n"
-"                \"min-valid-lifetime\": 1000,\n"
-"                \"name\": \"one\",\n"
-"                \"option-data\": [ ],\n"
-"                \"preferred-lifetime\": 5000,\n"
-"                \"template-test\": \"''\",\n"
-"                \"valid-lifetime\": 2000\n"
-"            },\n"
-"            {\n"
-"                \"name\": \"two\",\n"
-"                \"option-data\": [ ],\n"
-"                \"template-test\": \"''\"\n"
-"            }\n"
-"        ],\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -10531,10 +12006,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -10544,7 +12020,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -10555,17 +12031,16 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
-"            \"packet-queue-size\": 64,\n"
-"            \"thread-pool-size\": 0\n"
+"            \"packet-queue-size\": 1024,\n"
+"            \"thread-pool-size\": 48\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
 "        \"reservations-lookup-first\": false,\n"
@@ -10574,55 +12049,24 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
-"            {\n"
-"                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
-"                \"id\": 1,\n"
-"                \"max-valid-lifetime\": 7200,\n"
-"                \"min-valid-lifetime\": 7200,\n"
-"                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
-"                \"pools\": [\n"
-"                    {\n"
-"                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::1-2001:db8:1::ffff\"\n"
-"                    }\n"
-"                ],\n"
-"                \"rapid-commit\": false,\n"
-"                \"relay\": {\n"
-"                    \"ip-addresses\": [ ]\n"
-"                },\n"
-"                \"reservations\": [ ],\n"
-"                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
-"                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
-"                \"valid-lifetime\": 7200\n"
-"            }\n"
-"        ],\n"
+"        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 7200\n"
 "    }\n",
-    // CONFIGURATION 63
+    // CONFIGURATION 75
 "{\n"
 "        \"allocator\": \"iterative\",\n"
-"        \"calculate-tee-times\": true,\n"
+"        \"authoritative\": false,\n"
+"        \"boot-file-name\": \"\",\n"
+"        \"calculate-tee-times\": false,\n"
 "        \"ddns-conflict-resolution-mode\": \"no-check-with-dhcid\",\n"
 "        \"ddns-generated-prefix\": \"myhost\",\n"
 "        \"ddns-override-client-update\": false,\n"
@@ -10645,10 +12089,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"dhcp-queue-control\": {\n"
 "            \"capacity\": 64,\n"
 "            \"enable-queue\": false,\n"
-"            \"queue-type\": \"kea-ring6\"\n"
+"            \"queue-type\": \"kea-ring4\"\n"
 "        },\n"
 "        \"dhcp4o6-port\": 0,\n"
 "        \"early-global-reservations-lookup\": false,\n"
+"        \"echo-client-id\": true,\n"
 "        \"expired-leases-processing\": {\n"
 "            \"flush-reclaimed-timer-wait-time\": 25,\n"
 "            \"hold-reclaimed-time\": 3600,\n"
@@ -10658,7 +12103,7 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"unwarned-reclaim-cycles\": 5\n"
 "        },\n"
 "        \"hooks-libraries\": [ ],\n"
-"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\" ],\n"
+"        \"host-reservation-identifiers\": [ \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" ],\n"
 "        \"hostname-char-replacement\": \"\",\n"
 "        \"hostname-char-set\": \"[^A-Za-z0-9.-]\",\n"
 "        \"interfaces-config\": {\n"
@@ -10669,18 +12114,17 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"lease-database\": {\n"
 "            \"type\": \"memfile\"\n"
 "        },\n"
-"        \"mac-sources\": [ \"any\" ],\n"
+"        \"match-client-id\": true,\n"
 "        \"multi-threading\": {\n"
 "            \"enable-multi-threading\": true,\n"
 "            \"packet-queue-size\": 64,\n"
 "            \"thread-pool-size\": 0\n"
 "        },\n"
+"        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"parked-packet-limit\": 256,\n"
-"        \"pd-allocator\": \"iterative\",\n"
 "        \"rebind-timer\": 2000,\n"
-"        \"relay-supplied-options\": [ \"65\" ],\n"
 "        \"renew-timer\": 1000,\n"
 "        \"reservations-global\": false,\n"
 "        \"reservations-in-subnet\": true,\n"
@@ -10690,37 +12134,31 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"extended-info-checks\": \"fix\",\n"
 "            \"lease-checks\": \"warn\"\n"
 "        },\n"
-"        \"server-id\": {\n"
-"            \"enterprise-id\": 0,\n"
-"            \"htype\": 0,\n"
-"            \"identifier\": \"\",\n"
-"            \"persist\": true,\n"
-"            \"time\": 0,\n"
-"            \"type\": \"LLT\"\n"
-"        },\n"
+"        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
+"        \"stash-agent-options\": false,\n"
 "        \"statistic-default-sample-age\": 0,\n"
 "        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
-"        \"subnet6\": [\n"
+"        \"subnet4\": [\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"ddns-conflict-resolution-mode\": \"check-with-dhcid\",\n"
 "                \"id\": 1,\n"
 "                \"max-valid-lifetime\": 4000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:1::1-2001:db8:1::ffff\"\n"
+"                        \"pool\": \"192.0.2.1-192.0.2.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -10728,28 +12166,28 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:1::/64\",\n"
+"                \"subnet\": \"192.0.2.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            },\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"ddns-conflict-resolution-mode\": \"check-exists-with-dhcid\",\n"
 "                \"id\": 2,\n"
 "                \"max-valid-lifetime\": 4000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:2::1-2001:db8:2::ffff\"\n"
+"                        \"pool\": \"192.0.3.1-192.0.3.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -10757,28 +12195,28 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:2::/64\",\n"
+"                \"subnet\": \"192.0.3.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            },\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"ddns-conflict-resolution-mode\": \"no-check-without-dhcid\",\n"
 "                \"id\": 3,\n"
 "                \"max-valid-lifetime\": 4000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:3::1-2001:db8:3::ffff\"\n"
+"                        \"pool\": \"192.0.4.1-192.0.4.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -10786,28 +12224,28 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:3::/64\",\n"
+"                \"subnet\": \"192.0.4.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            },\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"ddns-conflict-resolution-mode\": \"no-check-with-dhcid\",\n"
 "                \"id\": 4,\n"
 "                \"max-valid-lifetime\": 4000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:4::1-2001:db8:4::ffff\"\n"
+"                        \"pool\": \"192.0.5.1-192.0.5.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -10815,27 +12253,27 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:4::/64\",\n"
+"                \"subnet\": \"192.0.5.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            },\n"
 "            {\n"
+"                \"4o6-interface\": \"\",\n"
+"                \"4o6-interface-id\": \"\",\n"
+"                \"4o6-subnet\": \"\",\n"
 "                \"allocator\": \"iterative\",\n"
-"                \"calculate-tee-times\": true,\n"
+"                \"calculate-tee-times\": false,\n"
 "                \"id\": 5,\n"
 "                \"max-valid-lifetime\": 4000,\n"
 "                \"min-valid-lifetime\": 4000,\n"
 "                \"option-data\": [ ],\n"
-"                \"pd-allocator\": \"iterative\",\n"
-"                \"pd-pools\": [ ],\n"
 "                \"pools\": [\n"
 "                    {\n"
 "                        \"option-data\": [ ],\n"
-"                        \"pool\": \"2001:db8:5::1-2001:db8:5::ffff\"\n"
+"                        \"pool\": \"192.0.6.1-192.0.6.100\"\n"
 "                    }\n"
 "                ],\n"
-"                \"rapid-commit\": false,\n"
 "                \"rebind-timer\": 2000,\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -10843,14 +12281,14 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"renew-timer\": 1000,\n"
 "                \"reservations\": [ ],\n"
 "                \"store-extended-info\": false,\n"
-"                \"subnet\": \"2001:db8:5::/64\",\n"
+"                \"subnet\": \"192.0.6.0/24\",\n"
 "                \"t1-percent\": 0.5,\n"
-"                \"t2-percent\": 0.8,\n"
+"                \"t2-percent\": 0.875,\n"
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
 "        \"t1-percent\": 0.5,\n"
-"        \"t2-percent\": 0.8,\n"
+"        \"t2-percent\": 0.875,\n"
 "        \"valid-lifetime\": 4000\n"
 "    }\n"
 };
@@ -10883,7 +12321,7 @@ static_assert(max_config_counter == sizeof(UNPARSED_CONFIGS) / sizeof(char*),
 void
 outputFormatted(const std::string& config) {
     // pretty print it
-    ConstElementPtr json = parseDHCP6(config);
+    ConstElementPtr json = parseDHCP4(config);
     std::string prettier = prettyPrint(json, 4, 4);
     // get it as a line array
     std::list<std::string> lines;
@@ -10903,7 +12341,7 @@ outputFormatted(const std::string& config) {
     }
 }
 
-} // namespace
+}  // namespace
 
 namespace isc {
 namespace dhcp {
@@ -10940,20 +12378,20 @@ extractConfig(const std::string& config) {
 
 namespace {
 
-/// Test fixture class (code from Dhcp6ParserTest)
-class Dhcp6GetConfigTest : public ::testing::TestWithParam<size_t> {
+/// Test fixture class (code from Dhcp4ParserTest)
+class Dhcp4GetConfigTest : public ::testing::TestWithParam<size_t> {
 public:
-    Dhcp6GetConfigTest() : rcode_(-1), srv_(0) {
-        // srv_(0) means to not open any sockets. We don't want to
+    Dhcp4GetConfigTest()
+    : rcode_(-1) {
+        // Open port 0 means to not do anything at all. We don't want to
         // deal with sockets here, just check if configuration handling
         // is sane.
-
-        // Reset configuration for each test.
+        srv_.reset(new ControlledDhcpv4Srv(0));
+        // Create fresh context.
         resetConfiguration();
     }
 
-    ~Dhcp6GetConfigTest() {
-        // Reset configuration database after each test.
+    ~Dhcp4GetConfigTest() {
         resetConfiguration();
     };
 
@@ -10986,19 +12424,19 @@ public:
             return (false);
         }
 
-        // try DHCP6 parser
+        // try DHCP4 parser
         try {
-            json = parseDHCP6(config, true);
+            json = parseDHCP4(config, true);
         } catch (...) {
             ADD_FAILURE() << "parsing failed for " << operation
                           << " on\n" << prettyPrint(json) << "\n";
             return (false);
         }
 
-        // try DHCP6 configure
+        // try DHCP4 configure
         ConstElementPtr status;
         try {
-            status = configureDhcp6Server(srv_, json);
+            status = configureDhcp4Server(*srv_, json);
         } catch (const std::exception& ex) {
             ADD_FAILURE() << "configure for " << operation
                           << " failed with " << ex.what()
@@ -11040,26 +12478,23 @@ public:
     void resetConfiguration() {
         string config = "{"
             "\"interfaces-config\": { \"interfaces\": [ \"*\" ] },"
-            "\"preferred-lifetime\": 3000,"
-            "\"rebind-timer\": 2000, "
-            "\"renew-timer\": 1000, "
             "\"valid-lifetime\": 4000, "
-            "\"subnet6\": [ ], "
+            "\"subnet4\": [ ], "
             "\"dhcp-ddns\": { \"enable-updates\" : false }, "
             "\"option-def\": [ ], "
             "\"option-data\": [ ] }";
         EXPECT_TRUE(executeConfiguration(config, "reset configuration"));
         CfgMgr::instance().clear();
-        CfgMgr::instance().setFamily(AF_INET6);
+        CfgMgr::instance().setFamily(AF_INET);
     }
 
-    int rcode_; ///< Return code (see @ref isc::config::parseAnswer)
-    ControlledDhcpv6Srv srv_; ///< Instance of the ControlledDhcp6Srv used during tests
-    ConstElementPtr comment_; ///< Comment (see @ref isc::config::parseAnswer)
+    boost::scoped_ptr<ControlledDhcpv4Srv> srv_; ///< DHCP4 server under test
+    int rcode_;                         ///< Return code from element parsing
+    ConstElementPtr comment_;           ///< Reason for parse fail
 };
 
 /// Test a configuration
-TEST_P(Dhcp6GetConfigTest, run) {
+TEST_P(Dhcp4GetConfigTest, run) {
     // configurations have not been extracted yet
     if (max_config_counter == 0) {
         return;
@@ -11084,9 +12519,9 @@ TEST_P(Dhcp6GetConfigTest, run) {
     // unparse it
     ConstSrvConfigPtr extracted = CfgMgr::instance().getStagingCfg();
     ConstElementPtr unparsed;
-    ASSERT_NO_THROW_LOG(unparsed = extracted->toElement());
+    ASSERT_NO_THROW(unparsed = extracted->toElement());
     ConstElementPtr dhcp;
-    ASSERT_NO_THROW_LOG(dhcp = unparsed->get("Dhcp6"));
+    ASSERT_NO_THROW(dhcp = unparsed->get("Dhcp4"));
     ASSERT_TRUE(dhcp);
 
     // dump if wanted else check
@@ -11100,11 +12535,11 @@ TEST_P(Dhcp6GetConfigTest, run) {
         ASSERT_NO_THROW_LOG(outputFormatted(dhcp->str()));
     } else {
         expected = UNPARSED_CONFIGS[config_counter];
-        // get the expected config using the dhcpv6 syntax parser
+        // get the expected config using the dhcpv4 syntax parser
         ElementPtr jsond;
-        ASSERT_NO_THROW_LOG(jsond = parseDHCP6(expected, true));
-        // get the expected config using the generic JSON syntax parser
+        ASSERT_NO_THROW_LOG(jsond = parseDHCP4(expected, true));
         ElementPtr jsonj;
+        // get the expected config using the generic JSON syntax parser
         ASSERT_NO_THROW_LOG(jsonj = parseJSON(expected));
         // the generic JSON parser does not handle comments
         EXPECT_TRUE(isEquivalent(jsond, moveComments(jsonj)));
@@ -11142,12 +12577,12 @@ public:
 
 /// Define the parameterized test loop.
 #ifdef INSTANTIATE_TEST_SUITE_P
-INSTANTIATE_TEST_SUITE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest,
+INSTANTIATE_TEST_SUITE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest,
                          ::testing::Range(static_cast<size_t>(0),
                                           max_config_counter),
                          IntToString());
 #else
-INSTANTIATE_TEST_CASE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest,
+INSTANTIATE_TEST_CASE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest,
                         ::testing::Range(static_cast<size_t>(0),
                                          max_config_counter),
                         IntToString());
index 4e30a37e83f98c9060f7706f8d5b6fec2ffb84de..896bb18c040267d8923811666be50bcac74770ee 100644 (file)
@@ -1105,7 +1105,7 @@ ControlledDhcpv6Srv::ControlledDhcpv6Srv(uint16_t server_port /*= DHCP6_SERVER_P
     // TimerMgr uses IO service to run asynchronous timers.
     TimerMgr::instance()->setIOService(getIOService());
 
-    // CommandMgr's use IO service to run asynchronous socket operations.
+    // CommandMgr and HttpCommandMgr use IO service to run asynchronous socket operations.
     CommandMgr::instance().setIOService(getIOService());
     HttpCommandMgr::instance().setIOService(getIOService());
 
index 5a859d967c6becc82789d5054984f72995cdbc1d..3906b1087efcb5b7b327d0f7a2b2a864a1fc5970 100644 (file)
@@ -280,7 +280,7 @@ TEST_F(ConfigTestKeaV4, examples4) {
         "backends.json",
         "classify.json",
         "classify2.json",
-        "comments.json",
+        //"comments.json",
         "config-backend.json",
         "dhcpv4-over-dhcpv6.json",
         "global-reservations.json",
@@ -320,7 +320,7 @@ TEST_F(ConfigTestKeaV6, examples6) {
         "backends.json",
         "classify.json",
         "classify2.json",
-        "comments.json",
+        //"comments.json",
         "config-backend.json",
         "dhcpv4-over-dhcpv6.json",
         "duid.json",