diff --git a/ChangeLog b/ChangeLog
index 8d3961dca9b1169200e00376757bfc0839dfe1b0..e9b3f3f91d06ed4013b7097629bbb3d775ffcee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,12 @@
+Kea 2.1.0 (development) released on Oct 27, 2021
+
 1957.	[build]		razvan
 	Library version numbers bumped for Kea 2.1.0 development
 	version.
 	(Gitlab #2141)
 
 1956.	[bug]		tmark
-	Modified stat_cmds hook library to omit statisics
+	Modified stat_cmds hook library to omit statistics
 	for non-existent subnets from results returned by
 	stat-lease4-get and stat-lease6-get commands.
 	(Gitlab #2033)
diff --git a/doc/examples/template-power-user-home/info.md b/doc/examples/template-power-user-home/info.md
index 3944c1b6c35356e4f1f59036e5eec80c24012ab9..2c92fa299f8491b61b96f58d86db6e2d794ea9c3 100644
--- a/doc/examples/template-power-user-home/info.md
+++ b/doc/examples/template-power-user-home/info.md
@@ -95,7 +95,7 @@ To deploy this setup, you need to conduct the following steps:
 
 5. Install CA and DHCPv4 on host2, similar to steps 1 and 2. Note the config file for the
    standby server is very similar, except the definition of ``this-server-name`` field
-   (and possibly inteface names). In many cases you can simply copy over the file
+   (and possibly interface names). In many cases you can simply copy over the file
    and just tweak it a little bit.
 
 Possible extensions
diff --git a/doc/examples/template-power-user-home/kea-dhcp4-1.conf b/doc/examples/template-power-user-home/kea-dhcp4-1.conf
index a706787f31d8aa66e878c7819ca39c2e3c7d0133..9f6bc22ef359bd1d7515a6631986b5e46a7bda45 100644
--- a/doc/examples/template-power-user-home/kea-dhcp4-1.conf
+++ b/doc/examples/template-power-user-home/kea-dhcp4-1.conf
@@ -48,7 +48,7 @@
     },
 
     // Let's configure some global parameters. The home network is not very dynamic
-    // and there's no shortage of addresses, so no need to recycle aggresively.
+    // and there's no shortage of addresses, so no need to recycle aggressively.
     "valid-lifetime": 43200, // leases will be valid for 12h
     "renew-timer": 21600, // clients should renew every 6h
     "rebind-timer": 32400, // clients should start looking for other servers after 9h
diff --git a/doc/examples/template-power-user-home/kea-dhcp4-2.conf b/doc/examples/template-power-user-home/kea-dhcp4-2.conf
index ee9b6f38c94bfd5fb3e0ae1aff4a77a1fd51f5be..23ff4264e258dd9719d3a752764d4b0986c4ab74 100644
--- a/doc/examples/template-power-user-home/kea-dhcp4-2.conf
+++ b/doc/examples/template-power-user-home/kea-dhcp4-2.conf
@@ -48,7 +48,7 @@
     },
 
     // Let's configure some global parameters. The home network is not very dynamic
-    // and there's no shortage of addresses, so no need to recycle aggresively.
+    // and there's no shortage of addresses, so no need to recycle aggressively.
     "valid-lifetime": 43200, // leases will be valid for 12h
     "renew-timer": 21600, // clients should renew every 6h
     "rebind-timer": 32400, // clients should start looking for other servers after 9h
diff --git a/doc/sphinx/arm/ext-gss-tsig.rst b/doc/sphinx/arm/ext-gss-tsig.rst
index 0f85433e8a81bd1327a5a634f60286317a13f4fa..453a8bf14f8dc2ddd60f571262fb5049a30b4c22 100644
--- a/doc/sphinx/arm/ext-gss-tsig.rst
+++ b/doc/sphinx/arm/ext-gss-tsig.rst
@@ -250,7 +250,7 @@ You will be required to retype the password:
 
     Re-enter KDC database master key to verify:
 
-If succesfully applied, the following message will be displayed:
+If successfully applied, the following message will be displayed:
 
 .. code-block:: console
 
@@ -278,7 +278,7 @@ following way:
 
     kadmin.local -q "addprinc -randkey DNS/server.example.org"
 
-If succesfully created, the following message will be displayed:
+If successfully created, the following message will be displayed:
 
 .. code-block:: console
 
@@ -294,7 +294,7 @@ file with the name ``dns.keytab``.
 
     kadmin.local -q "ktadd -k /tmp/dns.keytab DNS/server.example.org"
 
-If succesfully exported, the following message will be displayed:
+If successfully exported, the following message will be displayed:
 
 .. code-block:: console
 
@@ -309,7 +309,7 @@ following way:
 
     kadmin.local -q "addprinc -randkey DHCP/admin.example.org"
 
-If succesfully created, the following message will be displayed:
+If successfully created, the following message will be displayed:
 
 .. code-block:: console
 
@@ -415,8 +415,8 @@ It is possible to get status or restart logs:
     systemctl status named.service
     journalctl -u named | tail -n 30
 
-Windows Advanced Directory Configuration
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Windows Active Directory Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This sub-section is based on an Amazon AWS provided Microsoft Windows Server
 2016 with Active Directory pre-installed so describes only the steps used
@@ -495,7 +495,8 @@ An excerpt from D2 server is provided below. More examples are available in the
                         },
                         { // This server also has an entry there, so will
                           // use GSS-TSIG, too.
-                            "ip-address": "192.0.2.2"
+                            "ip-address": "192.0.2.2",
+                            "port": 5300
                         }
                     ]
                 }
diff --git a/doc/sphinx/arm/hooks-ha.rst b/doc/sphinx/arm/hooks-ha.rst
index 62b33ee18f07bdfb9a00db9c8656115e2c232a6c..47883f13f6f61bec2064af589983d9098cbc1a4c 100644
--- a/doc/sphinx/arm/hooks-ha.rst
+++ b/doc/sphinx/arm/hooks-ha.rst
@@ -1080,8 +1080,8 @@ be minimal.
 
    Currently, active servers place lease updates to be sent to peers onto internal
    queues (one queue per peer/URL).  In passive-backup mode, active servers do not
-   wait for lease udpates to be acknowledged thus during times of heavy client
-   traffic it is possible for the number of lease updates queued for transimission
+   wait for lease updates to be acknowledged thus during times of heavy client
+   traffic it is possible for the number of lease updates queued for transmission
    to accumulate faster than they can be delivered.  As client traffic lessens the
    queues begin to empty.  As of Kea 2.0.0, active servers monitor the size of
    these queues and will emit periodic warnings (see HTTP_CILENT_QUEUE_SIZE_GROWING
@@ -1091,7 +1091,7 @@ be minimal.
    and seeing them sporadically during times of heavy traffic load does not
    necessarily indicate a problem.  If, however, they occur continually during
    times of routine traffic load they likely indicate potential mismatches in
-   server capibilities and/or configuration and this should be investigated as
+   server capabilities and/or configuration and this should be investigated as
    the size of the queues may eventually impair an active server's ability to
    respond to clients in a timely manner.
 
diff --git a/src/bin/d2/nc_add.h b/src/bin/d2/nc_add.h
index 15f31a4e2b3bef553d6cb8d3b06ea68f23b8bff0..6bb8ce311f5c1854384f2465b98bedd946217162 100644
--- a/src/bin/d2/nc_add.h
+++ b/src/bin/d2/nc_add.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2021 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/d2/nc_remove.h b/src/bin/d2/nc_remove.h
index f098680d9530b292f619fcfccf9ca45a9098619b..672a3d9841a8668af9a5529141c4bd4693fa0945 100644
--- a/src/bin/d2/nc_remove.h
+++ b/src/bin/d2/nc_remove.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015,2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2021 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/d2/simple_add.h b/src/bin/d2/simple_add.h
index 43a5d678a2abcc55d663ce0716453ba61bd79b13..bf617a50a77ccd90294f3d84d739a056dbcb96d1 100644
--- a/src/bin/d2/simple_add.h
+++ b/src/bin/d2/simple_add.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2020-2021 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/d2/simple_remove.h b/src/bin/d2/simple_remove.h
index 58bf1ef171d7d560d31e62ff8a70c8d414335e1b..957cb138a7ce11501b56a68cebbf3b40773cee2e 100644
--- a/src/bin/d2/simple_remove.h
+++ b/src/bin/d2/simple_remove.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2020-2021 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/d2/tests/d2_queue_mgr_unittests.cc b/src/bin/d2/tests/d2_queue_mgr_unittests.cc
index d2d41f5e5639e3eb52040ad8aa89f33be40c8a4a..42177e6f6a67909b0a56cc9772877b09a68acb1b 100644
--- a/src/bin/d2/tests/d2_queue_mgr_unittests.cc
+++ b/src/bin/d2/tests/d2_queue_mgr_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2021 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 4de3e5bdc8085c0cb00e995302ec09526d6a4dc0..7419027d2c75436938fe495672de7bd6aa085238 100644
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -920,10 +920,6 @@ environment variable is set. It's causing Kea to send packets to
 source address of incoming packet. Usable just in testing environment
 to simulate multiple subnet traffic from single source.
 
-% DHCP6_DHCP4O6_PACKET_RECEIVED received DHCPv4o6 packet from DHCPv6 server (type %1) for %2 port %3 on interface %4
-This debug message is printed when the server is receiving a DHCPv4o6
-from the DHCPv6 server over inter-process communication.
-
 % DHCP4_UNKNOWN_ADDRESS_REQUESTED %1: client requested an unknown address, client sent ciaddr %2, requested-ip-address %3
 This message indicates that the client requested an address that does
 not belong to any dynamic pools managed by this server.  The first argument
@@ -931,3 +927,7 @@ contains the client and the transaction identification information.
 The second argument contains the IPv4 address in the ciaddr field. The
 third argument contains the IPv4 address in the requested-ip-address
 option (if present).
+
+% DHCP6_DHCP4O6_PACKET_RECEIVED received DHCPv4o6 packet from DHCPv6 server (type %1) for %2 port %3 on interface %4
+This debug message is printed when the server is receiving a DHCPv4o6
+from the DHCPv6 server over inter-process communication.
diff --git a/src/bin/dhcp4/tests/dora_unittest.cc b/src/bin/dhcp4/tests/dora_unittest.cc
index 6fa77c5e052de8da7a1a4f6dd524f0f1ee134243..b8de99c7cb0c695e327e0e9f206255f87db67fe8 100644
--- a/src/bin/dhcp4/tests/dora_unittest.cc
+++ b/src/bin/dhcp4/tests/dora_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2021 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/hooks/dhcp/high_availability/ha_service.cc b/src/hooks/dhcp/high_availability/ha_service.cc
index 9a15fa2c35cf72062692a306e943f89caf77755c..f7d2e8ec0b64969f145a1a8565568ed4b3ac888e 100644
--- a/src/hooks/dhcp/high_availability/ha_service.cc
+++ b/src/hooks/dhcp/high_availability/ha_service.cc
@@ -2265,7 +2265,7 @@ HAService::synchronize(std::string& status_message, const std::string& server_na
                 });
 
             } else {
-                // Synchronization was unsuccessul. Send the dhcp-enable command to
+                // Synchronization was unsuccessful. Send the dhcp-enable command to
                 //  re-enable the DHCP service. Note, that we don't send the
                 // ha-sync-complete-notify command in this case. It is only sent in
                 // the case when synchronization ends successfully.
diff --git a/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc b/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc
index c8fddcfa7dd9b7cb957945c669cacc6dcb00b8f1..6aa6ca8896bc38daaa2b178b109d98a34da68c17 100644
--- a/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc
+++ b/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc
@@ -5527,7 +5527,7 @@ TEST_F(HAServiceStateMachineTest, waitingParterDownLoadBalancingPartnerDown) {
     // It may happen when the partner did not crash but there was a temporary
     // communication error with it. It is possible that this server was not
     // configured to monitor unacked clients and that's why it transitioned
-    // to the partner-down state. The partner may be configured differiently.
+    // to the partner-down state. The partner may be configured differently.
     // The partner was not receiving lease updates from us, so we need to
     // force it to transition to the waiting state and synchronize. We stay
     // in the partner-down state as long as necessary to force the partner
diff --git a/src/lib/asiodns/io_fetch.h b/src/lib/asiodns/io_fetch.h
index fdbeee3fda16dc3fe1a08f54a4b90ef37c7e891c..4b247abfa462d3dad930c8f71a8181f2689d346e 100644
--- a/src/lib/asiodns/io_fetch.h
+++ b/src/lib/asiodns/io_fetch.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2021 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/lib/d2srv/d2_update_message.cc b/src/lib/d2srv/d2_update_message.cc
index 4a94a58dcb5f60810eb094dbed6ab1904fa57429..1917d6e33959287626713aee8fea444e31e6bd06 100644
--- a/src/lib/d2srv/d2_update_message.cc
+++ b/src/lib/d2srv/d2_update_message.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2021 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/lib/d2srv/d2_update_message.h b/src/lib/d2srv/d2_update_message.h
index 91d379a2e04adeca2a5a9e034a16e7a010227a4a..8365128d0516d4aee877a232c466510fc62e4ca4 100644
--- a/src/lib/d2srv/d2_update_message.h
+++ b/src/lib/d2srv/d2_update_message.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015,2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2021 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/lib/d2srv/d2_zone.cc b/src/lib/d2srv/d2_zone.cc
index 3eef2441a7727d2b255cea4eabcca074483c0eb1..c48b2c5fac1a51936e3275bcb05dc0d92e0ee02c 100644
--- a/src/lib/d2srv/d2_zone.cc
+++ b/src/lib/d2srv/d2_zone.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2021 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/lib/d2srv/d2_zone.h b/src/lib/d2srv/d2_zone.h
index ec13871094a4bb45663553cac8b32aa3a3e1efa1..077ad16b8be839acc0a1bf2419d3a2ff94f210cb 100644
--- a/src/lib/d2srv/d2_zone.h
+++ b/src/lib/d2srv/d2_zone.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2021 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/lib/d2srv/tests/d2_zone_unittests.cc b/src/lib/d2srv/tests/d2_zone_unittests.cc
index 23bff13075b13ae47fc488920d2ff7f3a903dff5..f252d07aa10da43146e61c6c35bdf09f0f49d7bd 100644
--- a/src/lib/d2srv/tests/d2_zone_unittests.cc
+++ b/src/lib/d2srv/tests/d2_zone_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015,2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2021 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/lib/dhcp/dhcp6.h b/src/lib/dhcp/dhcp6.h
index 0e53aff353403b8dcf66c9c22e07e7b6c23e660f..d971d22fb1c04b76553ba02641ad2e59c37e24b2 100644
--- a/src/lib/dhcp/dhcp6.h
+++ b/src/lib/dhcp/dhcp6.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2006-2021 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.cc b/src/lib/dhcpsrv/dhcpsrv_messages.cc
index 8d50c93ffe726ae883006ae3e37ce4624077e21d..d69865f46d3494743fba43f29595267452aa78b5 100644
--- a/src/lib/dhcpsrv/dhcpsrv_messages.cc
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.cc
@@ -510,7 +510,7 @@ const char* values[] = {
     "DHCPSRV_PGSQL_START_TRANSACTION", "starting a new PostgreSQL transaction",
     "DHCPSRV_PGSQL_UPDATE_ADDR4", "updating IPv4 lease for address %1",
     "DHCPSRV_PGSQL_UPDATE_ADDR6", "updating IPv6 lease for address %1, lease type %2",
-    "DHCPSRV_QUEUE_NCR", "%1: name change request to %2 DNS entry queued: %3",
+    "DHCPSRV_QUEUE_NCR", "%1: Name change request to %2 DNS entry queued: %3",
     "DHCPSRV_QUEUE_NCR_FAILED", "%1: queuing %2 name change request failed for lease %3: %4",
     "DHCPSRV_QUEUE_NCR_SKIP", "%1: skip queuing name change request for lease: %2",
     "DHCPSRV_TIMERMGR_CALLBACK_FAILED", "running handler for timer %1 caused exception: %2",
diff --git a/src/lib/eval/tests/context_unittest.cc b/src/lib/eval/tests/context_unittest.cc
index 9d2844ae32cf67d536f0c0f249846266770de783..26ef533a99b4cb5a878c35ddb639201d3d7b16eb 100644
--- a/src/lib/eval/tests/context_unittest.cc
+++ b/src/lib/eval/tests/context_unittest.cc
@@ -404,7 +404,7 @@ public:
         EXPECT_EQ(expected_client_class, member->getClientClass());
     }
 
-    /// @rief This tests attempts to parse the expression then checks
+    /// @brief This tests attempts to parse the expression then checks
     /// if the number of tokens is correct and the TokenMember is as
     /// expected.
     ///
diff --git a/src/lib/http/client.cc b/src/lib/http/client.cc
index 8eb3ed1eab9276af80df2431a42d61f823f0a245..1d7074b6185f53f2d173b5f8a2c3ea22be68e3d2 100644
--- a/src/lib/http/client.cc
+++ b/src/lib/http/client.cc
@@ -985,7 +985,7 @@ private:
 
         /// @brief Adds a request to the end of the request queue.
         ///
-        /// If the size of the queue exceeds a threhsold and appears
+        /// If the size of the queue exceeds a threshold and appears
         /// to be growing it will emit a warning log.
         ///
         /// @param desc RequestDescriptor to queue.