From: Michal Nowikowski <godfryd@isc.org>
Date: Tue, 28 May 2019 06:52:24 +0000 (+0200)
Subject: updated versions, updated copyright dates, sorted messages
X-Git-Tag: Kea-1.6.0-beta~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fccb0cf41015196dd8acea0f08a83e767ef9effa;p=thirdparty%2Fkea.git

updated versions, updated copyright dates, sorted messages
---

diff --git a/ChangeLog b/ChangeLog
index aef9b85251..b87d054229 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Kea 1.6.0-beta released on May 29, 2019
+
 1586.	[build]		razvan, marcin
 	Bumped up libraries version numbers for Kea 1.6.0 beta release.
 	(Gitlab #617,!340, git c0434bf882b6ec483120e39f6b70b5a40fe7c711)
diff --git a/configure.ac b/configure.ac
index 7788322baf..6cf2bfc347 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.69])
 # For GIT versions, this is x.y.z-git, where x.y.z denotes the software
 # version that was used as a base + changes that were made later, but
 # are not released yet.
-AC_INIT(kea,1.5.0-git, kea-dev@lists.isc.org)
+AC_INIT(kea,1.6.0-beta-git, kea-dev@lists.isc.org)
 AC_CONFIG_SRCDIR(README)
 
 # serial-tests is not available in automake version before 1.13, so
diff --git a/doc/devel/contribute.dox b/doc/devel/contribute.dox
index 2e249971d7..1618d7d3b2 100644
--- a/doc/devel/contribute.dox
+++ b/doc/devel/contribute.dox
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/doc/devel/unit-tests.dox b/doc/devel/unit-tests.dox
index 730c935d52..853dc00e5c 100644
--- a/doc/devel/unit-tests.dox
+++ b/doc/devel/unit-tests.dox
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2019 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/doc/guide/classify.xml b/doc/guide/classify.xml
index 55412d8910..c677ffdd11 100644
--- a/doc/guide/classify.xml
+++ b/doc/guide/classify.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2015-2019 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/doc/guide/congestion-handling.xml b/doc/guide/congestion-handling.xml
index 74b8b75fba..5ab87b8d68 100644
--- a/doc/guide/congestion-handling.xml
+++ b/doc/guide/congestion-handling.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018-2019 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/doc/guide/hooks-class-cmds.xml b/doc/guide/hooks-class-cmds.xml
index c6324bb635..e7946b2a63 100644
--- a/doc/guide/hooks-class-cmds.xml
+++ b/doc/guide/hooks-class-cmds.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018-2019 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/doc/guide/hooks-ha.xml b/doc/guide/hooks-ha.xml
index aba48f01b5..5946353b18 100644
--- a/doc/guide/hooks-ha.xml
+++ b/doc/guide/hooks-ha.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018-2019 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/doc/guide/hooks-lease-cmds.xml b/doc/guide/hooks-lease-cmds.xml
index 6beac6656a..7b7d6c8133 100644
--- a/doc/guide/hooks-lease-cmds.xml
+++ b/doc/guide/hooks-lease-cmds.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2018-2019 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/doc/guide/intro.xml b/doc/guide/intro.xml
index 2b273c6025..ef4be8d07c 100644
--- a/doc/guide/intro.xml
+++ b/doc/guide/intro.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2014-2019 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/doc/guide/kea-guide.xml b/doc/guide/kea-guide.xml
index 73e689fc65..40ce27fdb9 100644
--- a/doc/guide/kea-guide.xml
+++ b/doc/guide/kea-guide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- - Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2014-2019 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/doc/guide/keactrl.xml b/doc/guide/keactrl.xml
index a6009dd2c4..c236ac73ac 100644
--- a/doc/guide/keactrl.xml
+++ b/doc/guide/keactrl.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2014-2019 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/doc/guide/lease-expiration.xml b/doc/guide/lease-expiration.xml
index 3fd2ef1b64..a970ef68bb 100644
--- a/doc/guide/lease-expiration.xml
+++ b/doc/guide/lease-expiration.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2015-2019 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/doc/guide/lfc.xml b/doc/guide/lfc.xml
index a894c9391a..47aca8a241 100644
--- a/doc/guide/lfc.xml
+++ b/doc/guide/lfc.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2015-2019 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/doc/guide/quickstart.xml b/doc/guide/quickstart.xml
index b5a29a4c56..ca68b8d50a 100644
--- a/doc/guide/quickstart.xml
+++ b/doc/guide/quickstart.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2014-2019 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/doc/guide/shell.xml b/doc/guide/shell.xml
index 689dbdd198..45e76e17a9 100644
--- a/doc/guide/shell.xml
+++ b/doc/guide/shell.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2017-2019 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/doc/guide/stats.xml b/doc/guide/stats.xml
index 8e2c5f4021..c5004231ff 100644
--- a/doc/guide/stats.xml
+++ b/doc/guide/stats.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2015-2019 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/admin/kea-admin.xml b/src/bin/admin/kea-admin.xml
index 8192c0f7d7..b8c5f3780c 100644
--- a/src/bin/admin/kea-admin.xml
+++ b/src/bin/admin/kea-admin.xml
@@ -10,8 +10,8 @@
 <refentry>
   <info>
     <productname>ISC Kea</productname>
-    <date>Dec 14, 2018</date>
-    <edition>1.5.0</edition>
+    <date>May 29, 2019</date>
+    <edition>1.6.0-beta</edition>
     <author><personname/><contrib>The Kea software has been written by a number of
         engineers working for ISC: Tomek Mrugalski, Stephen Morris, Marcin
         Siodelski, Thomas Markwalder, Francis Dupont, Jeremy C. Reed,
diff --git a/src/bin/admin/tests/cql_tests.sh.in b/src/bin/admin/tests/cql_tests.sh.in
index 2d1cb945e8..7fa681028a 100644
--- a/src/bin/admin/tests/cql_tests.sh.in
+++ b/src/bin/admin/tests/cql_tests.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2019 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/agent/kea-ctrl-agent.xml b/src/bin/agent/kea-ctrl-agent.xml
index 2e3e64c58c..16532f2204 100644
--- a/src/bin/agent/kea-ctrl-agent.xml
+++ b/src/bin/agent/kea-ctrl-agent.xml
@@ -11,8 +11,8 @@
 
   <info>
     <productname>ISC Kea</productname>
-    <date>Dec 14, 2018</date>
-    <edition>1.5.0</edition>
+    <date>May 29, 2019</date>
+    <edition>1.6.0-beta</edition>
     <author>
       <contrib>The Kea software has been written by a number of
         engineers working for ISC: Tomek Mrugalski, Stephen Morris, Marcin
diff --git a/src/bin/agent/simple_parser.cc b/src/bin/agent/simple_parser.cc
index 9f8718c7ba..c5eeababc4 100644
--- a/src/bin/agent/simple_parser.cc
+++ b/src/bin/agent/simple_parser.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2019 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/agent/tests/ca_command_mgr_unittests.cc b/src/bin/agent/tests/ca_command_mgr_unittests.cc
index bf50f61148..f464c935b4 100644
--- a/src/bin/agent/tests/ca_command_mgr_unittests.cc
+++ b/src/bin/agent/tests/ca_command_mgr_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2019 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/agent/tests/ca_process_unittests.cc b/src/bin/agent/tests/ca_process_unittests.cc
index 3f49dfcbdc..c1ebaf65c7 100644
--- a/src/bin/agent/tests/ca_process_unittests.cc
+++ b/src/bin/agent/tests/ca_process_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2019 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/d2_cfg_mgr.h b/src/bin/d2/d2_cfg_mgr.h
index a3e1ec3ee8..a316d77a12 100644
--- a/src/bin/d2/d2_cfg_mgr.h
+++ b/src/bin/d2/d2_cfg_mgr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2019 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/d2_config.h b/src/bin/d2/d2_config.h
index 713c37496e..bb8f2f1540 100644
--- a/src/bin/d2/d2_config.h
+++ b/src/bin/d2/d2_config.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/d2_controller.h b/src/bin/d2/d2_controller.h
index 2e98d35efa..6f61735828 100644
--- a/src/bin/d2/d2_controller.h
+++ b/src/bin/d2/d2_controller.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/d2_process.cc b/src/bin/d2/d2_process.cc
index 7baaffe8f4..bee7c7f0f4 100644
--- a/src/bin/d2/d2_process.cc
+++ b/src/bin/d2/d2_process.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/d2_process.h b/src/bin/d2/d2_process.h
index d453665195..5ca34222d3 100644
--- a/src/bin/d2/d2_process.h
+++ b/src/bin/d2/d2_process.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/d2_simple_parser.cc b/src/bin/d2/d2_simple_parser.cc
index 2344680b7e..09186d3f0d 100644
--- a/src/bin/d2/d2_simple_parser.cc
+++ b/src/bin/d2/d2_simple_parser.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2019 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/kea-dhcp-ddns.xml b/src/bin/d2/kea-dhcp-ddns.xml
index 2f62e017eb..0610906434 100644
--- a/src/bin/d2/kea-dhcp-ddns.xml
+++ b/src/bin/d2/kea-dhcp-ddns.xml
@@ -10,8 +10,8 @@
 
   <info>
     <productname>ISC Kea</productname>
-    <date>Dec 14, 2018</date>
-    <edition>1.5.0</edition>
+    <date>May 29, 2019</date>
+    <edition>1.6.0-beta</edition>
     <author>
       <contrib>The Kea software has been written by a number of
         engineers working for ISC: Tomek Mrugalski, Stephen Morris, Marcin
diff --git a/src/bin/d2/parser_context.cc b/src/bin/d2/parser_context.cc
index 16caa286e4..7532d64a3a 100644
--- a/src/bin/d2/parser_context.cc
+++ b/src/bin/d2/parser_context.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2019 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_cfg_mgr_unittests.cc b/src/bin/d2/tests/d2_cfg_mgr_unittests.cc
index f663b5696f..1ef388ea4a 100644
--- a/src/bin/d2/tests/d2_cfg_mgr_unittests.cc
+++ b/src/bin/d2/tests/d2_cfg_mgr_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/parser_unittest.cc b/src/bin/d2/tests/parser_unittest.cc
index 37c454bf4e..88d1f1dd69 100644
--- a/src/bin/d2/tests/parser_unittest.cc
+++ b/src/bin/d2/tests/parser_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2019 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/kea-dhcp4.xml b/src/bin/dhcp4/kea-dhcp4.xml
index 720ae47bd1..39170cd629 100644
--- a/src/bin/dhcp4/kea-dhcp4.xml
+++ b/src/bin/dhcp4/kea-dhcp4.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2011-2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2011-2019 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
@@ -10,8 +10,8 @@
 
   <info>
     <productname>ISC Kea</productname>
-    <date>Dec 14, 2018</date>
-    <edition>1.5.0</edition>
+    <date>May 29, 2019</date>
+    <edition>1.6.0-beta</edition>
     <author>
       <contrib>The Kea software has been written by a number of
         engineers working for ISC: Tomek Mrugalski, Stephen Morris, Marcin
diff --git a/src/bin/dhcp4/main.cc b/src/bin/dhcp4/main.cc
index 7e138ac00d..a6b70ef803 100644
--- a/src/bin/dhcp4/main.cc
+++ b/src/bin/dhcp4/main.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2019 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/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
index 4803e7d912..fb19c8805a 100644
--- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/tests/dhcp4_test_utils.cc b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
index 0f952eb98d..e9147dfc2b 100644
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.cc
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/tests/dhcp4_test_utils.h b/src/bin/dhcp4/tests/dhcp4_test_utils.h
index c286d97b56..2bc5cf5d70 100644
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.h
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/tests/fqdn_unittest.cc b/src/bin/dhcp4/tests/fqdn_unittest.cc
index a787e4df77..6f3ae43530 100644
--- a/src/bin/dhcp4/tests/fqdn_unittest.cc
+++ b/src/bin/dhcp4/tests/fqdn_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/tests/shared_network_unittest.cc b/src/bin/dhcp4/tests/shared_network_unittest.cc
index 019e9e4f70..247b13cead 100644
--- a/src/bin/dhcp4/tests/shared_network_unittest.cc
+++ b/src/bin/dhcp4/tests/shared_network_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2019 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/dhcp6/dhcp6_log.h b/src/bin/dhcp6/dhcp6_log.h
index 377b582d6e..cbc654404a 100644
--- a/src/bin/dhcp6/dhcp6_log.h
+++ b/src/bin/dhcp6/dhcp6_log.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index d2c202b787..b758eebab7 100644
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -53,6 +53,20 @@ by the process. The signal will be handled before the server starts
 waiting for next packets. The argument specifies the next signal to
 be handled by the server.
 
+% DHCP6_CB_FETCH_UPDATES_FAIL error on attempt to fetch configuration updates from the configuration backend(s): %1
+This error message is issued when the server attempted to fetch
+configuration updates from the database and this attempt failed.
+The server will re-try according to the configured value of the
+config-fetch-wait-time parameter. The sole argument contains the
+reason for failure.
+
+% DHCP6_CB_FETCH_UPDATES_RETRIES_EXHAUSTED maximum number of configuration fetch attempts: 10, has been exhausted without success
+This error indicates that the server has made a number of unsuccessful
+attempts to fetch configuration updates from a configuration backend.
+The server will continue to operate but won't make any further attempts
+to fetch configuration updates. The administrator must fix the configuration
+in the database and reload (or restart) the server.
+
 % DHCP6_CLASS_ASSIGNED %1: client packet has been assigned to the following class(es): %2
 This debug message informs that incoming packet has been assigned to specified
 class or classes. This is a normal behavior and indicates successful operation.
@@ -74,20 +88,6 @@ has no definition.
 This debug message informs that a class was listed for required evaluation but
 its definition does not include a test expression to evaluate.
 
-% DHCP6_CB_FETCH_UPDATES_FAIL error on attempt to fetch configuration updates from the configuration backend(s): %1
-This error message is issued when the server attempted to fetch
-configuration updates from the database and this attempt failed.
-The server will re-try according to the configured value of the
-config-fetch-wait-time parameter. The sole argument contains the
-reason for failure.
-
-% DHCP6_CB_FETCH_UPDATES_RETRIES_EXHAUSTED maximum number of configuration fetch attempts: 10, has been exhausted without success
-This error indicates that the server has made a number of unsuccessful
-attempts to fetch configuration updates from a configuration backend.
-The server will continue to operate but won't make any further attempts
-to fetch configuration updates. The administrator must fix the configuration
-in the database and reload (or restart) the server.
-
 % DHCP6_COMMAND_RECEIVED received command %1, arguments: %2
 A debug message listing the command (and possible arguments) received
 from the Kea control system by the IPv6 DHCP server.
@@ -184,6 +184,12 @@ This debug message is issued when the server did not receive a FQDN option
 from the client and client name replacement is enabled.  This provides a means
 to create DNS entries for unsophisticated clients.
 
+% DHCP6_DDNS_RECEIVE_FQDN %1: received DHCPv6 Client FQDN option: %2
+This debug message is logged when server has found the DHCPv6 Client FQDN Option
+sent by a client and started processing it. The first argument includes the
+client and transaction identification information. The second argument
+includes the received FQDN.
+
 % DHCP6_DDNS_REMOVE_OLD_LEASE_FQDN %1: FQDN for a lease: %2 has changed. New values: hostname = %3, reverse mapping = %4, forward mapping = %5
 This debug message is logged during lease renewal when an old lease that is
 no longer being offered has a different FQDN than the renewing lesae. Thus
@@ -193,12 +199,6 @@ details about the lease for which the FQDN information and/or mappings have
 changed. The remaining arguments hold the new FQDN information and flags for
 mappings.
 
-% DHCP6_DDNS_RECEIVE_FQDN %1: received DHCPv6 Client FQDN option: %2
-This debug message is logged when server has found the DHCPv6 Client FQDN Option
-sent by a client and started processing it. The first argument includes the
-client and transaction identification information. The second argument
-includes the received FQDN.
-
 % DHCP6_DDNS_REQUEST_SEND_FAILED failed sending a request to kea-dhcp-ddns, error: %1,  ncr: %2
 This error message indicates that IPv6 DHCP server failed to send a DDNS
 update request to the DHCP-DDNS server. This is most likely a configuration or
diff --git a/src/bin/dhcp6/dhcp6to4_ipc.cc b/src/bin/dhcp6/dhcp6to4_ipc.cc
index a9dbfd6ad0..02e275db80 100644
--- a/src/bin/dhcp6/dhcp6to4_ipc.cc
+++ b/src/bin/dhcp6/dhcp6to4_ipc.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2019 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/dhcp6/dhcp6to4_ipc.h b/src/bin/dhcp6/dhcp6to4_ipc.h
index fc025ceaea..d039e8f1b4 100644
--- a/src/bin/dhcp6/dhcp6to4_ipc.h
+++ b/src/bin/dhcp6/dhcp6to4_ipc.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2019 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/dhcp6/kea-dhcp6.xml b/src/bin/dhcp6/kea-dhcp6.xml
index 288ea87a5b..aca15dfde6 100644
--- a/src/bin/dhcp6/kea-dhcp6.xml
+++ b/src/bin/dhcp6/kea-dhcp6.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2011-2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2011-2019 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
@@ -9,8 +9,8 @@
 
   <info>
     <productname>ISC Kea</productname>
-    <date>Dec 14, 2018</date>
-    <edition>1.5.0</edition>
+    <date>May 29, 2019</date>
+    <edition>1.6.0-beta</edition>
     <author>
       <contrib>The Kea software has been written by a number of
         engineers working for ISC: Tomek Mrugalski, Stephen Morris, Marcin
diff --git a/src/bin/dhcp6/main.cc b/src/bin/dhcp6/main.cc
index 6f44221f5e..42946db9c6 100644
--- a/src/bin/dhcp6/main.cc
+++ b/src/bin/dhcp6/main.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2019 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/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
index 9a9990fd51..e4dfcca91a 100644
--- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/dhcp6/tests/dhcp6_test_utils.h b/src/bin/dhcp6/tests/dhcp6_test_utils.h
index a0ba34a965..d0a6bab121 100644
--- a/src/bin/dhcp6/tests/dhcp6_test_utils.h
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/dhcp6/tests/dhcp6to4_ipc_unittest.cc b/src/bin/dhcp6/tests/dhcp6to4_ipc_unittest.cc
index 93f97f092d..307f56e537 100644
--- a/src/bin/dhcp6/tests/dhcp6to4_ipc_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6to4_ipc_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2019 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/dhcp6/tests/simple_parser6_unittest.cc b/src/bin/dhcp6/tests/simple_parser6_unittest.cc
index 2703e7be1b..a2fe240dc7 100644
--- a/src/bin/dhcp6/tests/simple_parser6_unittest.cc
+++ b/src/bin/dhcp6/tests/simple_parser6_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2019 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/keactrl/keactrl.xml b/src/bin/keactrl/keactrl.xml
index 6c9e86e076..03a1354086 100644
--- a/src/bin/keactrl/keactrl.xml
+++ b/src/bin/keactrl/keactrl.xml
@@ -9,8 +9,8 @@
 <refentry>
   <info>
     <productname>ISC Kea</productname>
-    <date>Dec 14, 2018</date>
-    <edition>1.5.0</edition>
+    <date>May 29, 2019</date>
+    <edition>1.6.0-beta</edition>
     <author>
       <personname/>
       <contrib>The Kea software has been written by a number of
diff --git a/src/bin/lfc/kea-lfc.xml b/src/bin/lfc/kea-lfc.xml
index 049b826352..83fc990731 100644
--- a/src/bin/lfc/kea-lfc.xml
+++ b/src/bin/lfc/kea-lfc.xml
@@ -11,8 +11,8 @@
 
   <info>
     <productname>ISC Kea</productname>
-    <date>Dec 14, 2018</date>
-    <edition>1.5.0</edition>
+    <date>May 29, 2019</date>
+    <edition>1.6.0-beta</edition>
     <author><personname/><contrib>The Kea software has been written by a number of
         engineers working for ISC: Tomek Mrugalski, Stephen Morris, Marcin
         Siodelski, Thomas Markwalder, Francis Dupont, Jeremy C. Reed,
diff --git a/src/bin/netconf/kea-netconf.xml b/src/bin/netconf/kea-netconf.xml
index 02f3fae1cd..e9bdcd1801 100644
--- a/src/bin/netconf/kea-netconf.xml
+++ b/src/bin/netconf/kea-netconf.xml
@@ -10,8 +10,8 @@
 
   <info>
     <productname>ISC Kea</productname>
-    <date>Dec 14, 2018</date>
-    <edition>1.5.0</edition>
+    <date>May 29, 2019</date>
+    <edition>1.6.0-beta</edition>
     <author>
       <contrib>The Kea software has been written by a number of
         engineers working for ISC: Tomek Mrugalski, Stephen Morris, Marcin
diff --git a/src/bin/netconf/tests/control_socket_unittests.cc b/src/bin/netconf/tests/control_socket_unittests.cc
index 0d55e25be5..b3c0fca5b7 100644
--- a/src/bin/netconf/tests/control_socket_unittests.cc
+++ b/src/bin/netconf/tests/control_socket_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/netconf/tests/netconf_unittests.cc b/src/bin/netconf/tests/netconf_unittests.cc
index b85a4589ee..289d58109c 100644
--- a/src/bin/netconf/tests/netconf_unittests.cc
+++ b/src/bin/netconf/tests/netconf_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/perfdhcp/command_options.cc b/src/bin/perfdhcp/command_options.cc
index f15b72d41d..c3f4dbaeca 100644
--- a/src/bin/perfdhcp/command_options.cc
+++ b/src/bin/perfdhcp/command_options.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/command_options.h b/src/bin/perfdhcp/command_options.h
index bf18ca12ef..8fdb83cf47 100644
--- a/src/bin/perfdhcp/command_options.h
+++ b/src/bin/perfdhcp/command_options.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/main.cc b/src/bin/perfdhcp/main.cc
index aa002d78ab..d5e8e6f11c 100644
--- a/src/bin/perfdhcp/main.cc
+++ b/src/bin/perfdhcp/main.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/perf_pkt4.cc b/src/bin/perfdhcp/perf_pkt4.cc
index 784f96dacc..0bceb82ba9 100644
--- a/src/bin/perfdhcp/perf_pkt4.cc
+++ b/src/bin/perfdhcp/perf_pkt4.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/perf_pkt4.h b/src/bin/perfdhcp/perf_pkt4.h
index a74ed43143..d00a2b121c 100644
--- a/src/bin/perfdhcp/perf_pkt4.h
+++ b/src/bin/perfdhcp/perf_pkt4.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/perf_pkt6.cc b/src/bin/perfdhcp/perf_pkt6.cc
index 72724148ad..066d8ba516 100644
--- a/src/bin/perfdhcp/perf_pkt6.cc
+++ b/src/bin/perfdhcp/perf_pkt6.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2019 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/perfdhcp/perf_pkt6.h b/src/bin/perfdhcp/perf_pkt6.h
index 8465c396eb..9181cebc72 100644
--- a/src/bin/perfdhcp/perf_pkt6.h
+++ b/src/bin/perfdhcp/perf_pkt6.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2015,2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/perf_socket.cc b/src/bin/perfdhcp/perf_socket.cc
index a27296682a..2beb7a7713 100644
--- a/src/bin/perfdhcp/perf_socket.cc
+++ b/src/bin/perfdhcp/perf_socket.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/perfdhcp.xml b/src/bin/perfdhcp/perfdhcp.xml
index 2fe4ac5d6c..6c9e7cc610 100644
--- a/src/bin/perfdhcp/perfdhcp.xml
+++ b/src/bin/perfdhcp/perfdhcp.xml
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2014-2019 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
@@ -10,8 +10,8 @@
 
     <info>
       <productname>ISC Kea</productname>
-      <date>Dec 14, 2018</date>
-      <edition>1.5.0</edition>
+      <date>May 29, 2019</date>
+      <edition>1.6.0-beta</edition>
       <author>
         <personname/>
         <contrib>The Kea software has been written by a number of
diff --git a/src/bin/perfdhcp/pkt_transform.cc b/src/bin/perfdhcp/pkt_transform.cc
index fad8d1cbd1..dd1a634436 100644
--- a/src/bin/perfdhcp/pkt_transform.cc
+++ b/src/bin/perfdhcp/pkt_transform.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/pkt_transform.h b/src/bin/perfdhcp/pkt_transform.h
index d1272f1777..99cdb19d18 100644
--- a/src/bin/perfdhcp/pkt_transform.h
+++ b/src/bin/perfdhcp/pkt_transform.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/rate_control.cc b/src/bin/perfdhcp/rate_control.cc
index 8d5ac2453a..6c2810ffee 100644
--- a/src/bin/perfdhcp/rate_control.cc
+++ b/src/bin/perfdhcp/rate_control.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/perfdhcp/rate_control.h b/src/bin/perfdhcp/rate_control.h
index bbd9f9ea4a..e85b8ba9e1 100644
--- a/src/bin/perfdhcp/rate_control.h
+++ b/src/bin/perfdhcp/rate_control.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/perfdhcp/receiver.cc b/src/bin/perfdhcp/receiver.cc
index d55830220c..3f42d816f0 100644
--- a/src/bin/perfdhcp/receiver.cc
+++ b/src/bin/perfdhcp/receiver.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/perfdhcp/receiver.h b/src/bin/perfdhcp/receiver.h
index e51e4f4076..2b7f2827f9 100644
--- a/src/bin/perfdhcp/receiver.h
+++ b/src/bin/perfdhcp/receiver.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/perfdhcp/stats_mgr.h b/src/bin/perfdhcp/stats_mgr.h
index 3a6a6d036a..deff500a04 100644
--- a/src/bin/perfdhcp/stats_mgr.h
+++ b/src/bin/perfdhcp/stats_mgr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/test_control.cc b/src/bin/perfdhcp/test_control.cc
index d639585867..19ed5cbeab 100644
--- a/src/bin/perfdhcp/test_control.cc
+++ b/src/bin/perfdhcp/test_control.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/test_control.h b/src/bin/perfdhcp/test_control.h
index bab51ec06e..0f75f72aac 100644
--- a/src/bin/perfdhcp/test_control.h
+++ b/src/bin/perfdhcp/test_control.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/tests/command_options_helper.h b/src/bin/perfdhcp/tests/command_options_helper.h
index 2184240b9c..dd8e5127b5 100644
--- a/src/bin/perfdhcp/tests/command_options_helper.h
+++ b/src/bin/perfdhcp/tests/command_options_helper.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/tests/command_options_unittest.cc b/src/bin/perfdhcp/tests/command_options_unittest.cc
index ef54afdaf7..31afddf289 100644
--- a/src/bin/perfdhcp/tests/command_options_unittest.cc
+++ b/src/bin/perfdhcp/tests/command_options_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/tests/rate_control_unittest.cc b/src/bin/perfdhcp/tests/rate_control_unittest.cc
index 69e6db5099..5619fd31c9 100644
--- a/src/bin/perfdhcp/tests/rate_control_unittest.cc
+++ b/src/bin/perfdhcp/tests/rate_control_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/perfdhcp/tests/receiver_unittest.cc b/src/bin/perfdhcp/tests/receiver_unittest.cc
index 95fc31e367..1a1cb688a6 100644
--- a/src/bin/perfdhcp/tests/receiver_unittest.cc
+++ b/src/bin/perfdhcp/tests/receiver_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/perfdhcp/tests/stats_mgr_unittest.cc b/src/bin/perfdhcp/tests/stats_mgr_unittest.cc
index 2759a2e129..e64cb6e79a 100644
--- a/src/bin/perfdhcp/tests/stats_mgr_unittest.cc
+++ b/src/bin/perfdhcp/tests/stats_mgr_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/perfdhcp/tests/test_control_unittest.cc b/src/bin/perfdhcp/tests/test_control_unittest.cc
index 87452f3dc5..aef88599c8 100644
--- a/src/bin/perfdhcp/tests/test_control_unittest.cc
+++ b/src/bin/perfdhcp/tests/test_control_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/shell/kea-shell.xml b/src/bin/shell/kea-shell.xml
index a549337aad..87573903a5 100644
--- a/src/bin/shell/kea-shell.xml
+++ b/src/bin/shell/kea-shell.xml
@@ -10,8 +10,8 @@
 
   <info>
     <productname>ISC Kea</productname>
-    <date>Dec 14, 2018</date>
-    <edition>1.5.0</edition>
+    <date>May 29, 2019</date>
+    <edition>1.6.0-beta</edition>
     <author>
       <contrib>The Kea software has been written by a number of
         engineers working for ISC: Tomek Mrugalski, Stephen Morris, Marcin
diff --git a/src/bin/sockcreator/kea-sockcreator.xml b/src/bin/sockcreator/kea-sockcreator.xml
index ce460f4b68..469144875a 100644
--- a/src/bin/sockcreator/kea-sockcreator.xml
+++ b/src/bin/sockcreator/kea-sockcreator.xml
@@ -10,8 +10,8 @@
 
   <refentryinfo>
     <productname>ISC Kea</productname>
-    <date>Dec 14, 2018</date>
-    <edition>1.5.0</edition>
+    <date>May 29, 2019</date>
+    <edition>1.6.0-beta</edition>
     <author>
       <contrib>The Kea software has been written by a number of
         engineers working for ISC: Tomek Mrugalski, Stephen Morris, Marcin
diff --git a/src/hooks/dhcp/high_availability/ha_service.cc b/src/hooks/dhcp/high_availability/ha_service.cc
index 005cae4f06..aed0d3403b 100644
--- a/src/hooks/dhcp/high_availability/ha_service.cc
+++ b/src/hooks/dhcp/high_availability/ha_service.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/tests/ha_service_unittest.cc b/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc
index 36f597d505..2feacd6aa1 100644
--- a/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc
+++ b/src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/mysql_cb/mysql_cb_messages.mes b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes
index 1009a7ac15..522f81f95f 100644
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_messages.mes
@@ -2,127 +2,126 @@
 
 $NAMESPACE isc::cb
 
-% MYSQL_CB_INIT_OK loading MYSQL CB hooks library successful
-This informational message indicates that the MySQL Configuration Backend hooks
-library has been loaded successfully.
+% MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4 create or update option pool start: %1 pool end: %2
+Debug message issued when triggered an action to create or update option by pool
 
-% MYSQL_CB_DEINIT_OK unloading MYSQAL CB hooks library successful
-This informational message indicates that the MySQL Configuration Backend hooks
-library has been unloaded successfully.
+% MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION6 create or update option pool start: %1 pool end: %2
+Debug message issued when triggered an action to create or update option by pool
 
-% MYSQL_CB_GET_SUBNET4_BY_PREFIX retrieving subnet by prefix: %1
-Debug message issued when triggered an action to retrieve subnet by prefix
+% MYSQL_CB_CREATE_UPDATE_BY_PREFIX_OPTION6 create or update option prefix: %1 prefix len: %2
+Debug message issued when triggered an action to create or update option by prefix
 
-% MYSQL_CB_GET_SUBNET4_BY_SUBNET_ID retrieving subnet by subnet id: %1
-Debug message issued when triggered an action to retrieve subnet by subnet id
+% MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION4 create or update option by subnet id: %1
+Debug message issued when triggered an action to create or update option by subnet id
 
-% MYSQL_CB_GET_ALL_SUBNETS4 retrieving all subnets
-Debug message issued when triggered an action to retrieve all subnets
+% MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION6 create or update option by subnet id: %1
+Debug message issued when triggered an action to create or update option by subnet id
 
-% MYSQL_CB_GET_ALL_SUBNETS4_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve all subnets
+% MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER4 create or update global parameter: %1
+Debug message issued when triggered an action to create or update global parameter
 
-% MYSQL_CB_GET_MODIFIED_SUBNETS4 retrieving modified subnets from: %1
-Debug message issued when triggered an action to retrieve modified subnets from specified time
+% MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER6 create or update global parameter: %1
+Debug message issued when triggered an action to create or update global parameter
 
-% MYSQL_CB_GET_MODIFIED_SUBNETS4_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve modified subnets from specified time
+% MYSQL_CB_CREATE_UPDATE_OPTION4 create or update option
+Debug message issued when triggered an action to create or update option
 
-% MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4 retrieving shared network: %1 subnets
-Debug message issued when triggered an action to retrieve shared network subnets
+% MYSQL_CB_CREATE_UPDATE_OPTION6 create or update option
+Debug message issued when triggered an action to create or update option
 
-% MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve shared network subnets
+% MYSQL_CB_CREATE_UPDATE_OPTION_DEF4 create or update option definition: %1 code: %2
+Debug message issued when triggered an action to create or update option definition
 
-% MYSQL_CB_GET_SHARED_NETWORK4 retrieving shared network: %1
-Debug message issued when triggered an action to retrieve shared network
+% MYSQL_CB_CREATE_UPDATE_OPTION_DEF6 create or update option definition: %1 code: %2
+Debug message issued when triggered an action to create or update option definition
 
-% MYSQL_CB_GET_ALL_SHARED_NETWORKS4 retrieving all shared networks
-Debug message issued when triggered an action to retrieve all shared networks
+% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK4 create or update shared network: %1
+Debug message issued when triggered an action to create or update shared network
 
-% MYSQL_CB_GET_ALL_SHARED_NETWORKS4_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve all shared networks
+% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK6 create or update shared network: %1
+Debug message issued when triggered an action to create or update shared network
 
-% MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4 retrieving modified shared networks from: %1
-Debug message issued when triggered an action to retrieve modified shared networks from specified time
+% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4 create or update shared network: %1 option
+Debug message issued when triggered an action to create or update shared network option
 
-% MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve modified shared networks from specified time
+% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6 create or update shared network: %1 option
+Debug message issued when triggered an action to create or update shared network option
 
-% MYSQL_CB_GET_OPTION_DEF4 retrieving option definition code: %1 space: %2
-Debug message issued when triggered an action to retrieve option definition
+% MYSQL_CB_CREATE_UPDATE_SUBNET4 create or update subnet: %1
+Debug message issued when triggered an action to create or update subnet
 
-% MYSQL_CB_GET_ALL_OPTION_DEFS4 retrieving all option definitions
-Debug message issued when triggered an action to retrieve all option definitions
+% MYSQL_CB_CREATE_UPDATE_SUBNET6 create or update subnet: %1
+Debug message issued when triggered an action to create or update subnet
 
-% MYSQL_CB_GET_ALL_OPTION_DEFS4_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve all option definitions
+% MYSQL_CB_DEINIT_OK unloading MYSQAL CB hooks library successful
+This informational message indicates that the MySQL Configuration Backend hooks
+library has been unloaded successfully.
 
-% MYSQL_CB_GET_MODIFIED_OPTION_DEFS4 retrieving modified option definitions from: %1
-Debug message issued when triggered an action to retrieve modified option definitions from specified time
+% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4 delete all global parameters
+Debug message issued when triggered an action to delete all global parameters
 
-% MYSQL_CB_GET_MODIFIED_OPTION_DEFS4_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve modified option definitions from specified time
+% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete all global parameters
 
-% MYSQL_CB_GET_OPTION4 retrieving option code: %1 space: %2
-Debug message issued when triggered an action to retrieve option
+% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6 delete all global parameters
+Debug message issued when triggered an action to delete all global parameters
 
-% MYSQL_CB_GET_ALL_OPTIONS4 retrieving all options
-Debug message issued when triggered an action to retrieve all options
+% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete all global parameters
 
-% MYSQL_CB_GET_ALL_OPTIONS4_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve all options
+% MYSQL_CB_DELETE_ALL_OPTION_DEFS4 delete all option definitions
+Debug message issued when triggered an action to delete all option definitions
 
-% MYSQL_CB_GET_MODIFIED_OPTIONS4 retrieving modified options from: %1
-Debug message issued when triggered an action to retrieve modified options from specified time
+% MYSQL_CB_DELETE_ALL_OPTION_DEFS4_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete all option definitions
 
-% MYSQL_CB_GET_MODIFIED_OPTIONS4_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve modified options from specified time
+% MYSQL_CB_DELETE_ALL_OPTION_DEFS6 delete all option definitions
+Debug message issued when triggered an action to delete all option definitions
 
-% MYSQL_CB_GET_GLOBAL_PARAMETER4 retrieving global parameter: %1
-Debug message issued when triggered an action to retrieve global parameter
+% MYSQL_CB_DELETE_ALL_OPTION_DEFS6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete all option definitions
 
-% MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4 retrieving all global parameters
-Debug message issued when triggered an action to retrieve all global parameters
+% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4 delete all shared networks
+Debug message issued when triggered an action to delete all shared networks
 
-% MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve all global parameters
+% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete all shared networks
 
-% MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4 retrieving modified global parameters from: %1
-Debug message issued when triggered an action to retrieve modified global parameters from specified time
+% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6 delete all shared networks
+Debug message issued when triggered an action to delete all shared networks
 
-% MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve modified global parameters from specified time
+% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete all shared networks
 
-% MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4 retrieving audit entries from: %1
-Debug message issued when triggered an action to retrieve audit entries from specified time
+% MYSQL_CB_DELETE_ALL_SUBNETS4 delete all subnets
+Debug message issued when triggered an action to delete all subnets
 
-% MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve audit entries from specified time
+% MYSQL_CB_DELETE_ALL_SUBNETS4_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete all subnets
 
-% MYSQL_CB_CREATE_UPDATE_SUBNET4 create or update subnet: %1
-Debug message issued when triggered an action to create or update subnet
+% MYSQL_CB_DELETE_ALL_SUBNETS6 delete all subnets
+Debug message issued when triggered an action to delete all subnets
 
-% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK4 create or update shared network: %1
-Debug message issued when triggered an action to create or update shared network
+% MYSQL_CB_DELETE_ALL_SUBNETS6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete all subnets
 
-% MYSQL_CB_CREATE_UPDATE_OPTION_DEF4 create or update option definition: %1 code: %2
-Debug message issued when triggered an action to create or update option definition
+% MYSQL_CB_DELETE_BY_POOL_OPTION4 delete pool start: %1 pool end: %2 option code: %3 space: %4
+Debug message issued when triggered an action to delete option by pool
 
-% MYSQL_CB_CREATE_UPDATE_OPTION4 create or update option
-Debug message issued when triggered an action to create or update option
+% MYSQL_CB_DELETE_BY_POOL_OPTION4_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete option by pool
 
-% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION4 create or update shared network: %1 option
-Debug message issued when triggered an action to create or update shared network option
+% MYSQL_CB_DELETE_BY_POOL_OPTION6 delete pool start: %1 pool end: %2 option code: %3 space: %4
+Debug message issued when triggered an action to delete option by pool
 
-% MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION4 create or update option by subnet id: %1
-Debug message issued when triggered an action to create or update option by subnet id
+% MYSQL_CB_DELETE_BY_POOL_OPTION6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete option by pool
 
-% MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION4 create or update option pool start: %1 pool end: %2
-Debug message issued when triggered an action to create or update option by pool
+% MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6 delete prefix: %1 prefix len: %2 option code: %3 space: %4
+Debug message issued when triggered an action to delete option by prefix
 
-% MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER4 create or update global parameter: %1
-Debug message issued when triggered an action to create or update global parameter
+% MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete option by prefix
 
 % MYSQL_CB_DELETE_BY_PREFIX_SUBNET4 delete subnet by prefix: %1
 Debug message issued when triggered an action to delete subnet by prefix
@@ -130,35 +129,59 @@ Debug message issued when triggered an action to delete subnet by prefix
 % MYSQL_CB_DELETE_BY_PREFIX_SUBNET4_RESULT deleted: %1 entries
 Debug message indicating the result of an action to delete subnet by prefix
 
+% MYSQL_CB_DELETE_BY_PREFIX_SUBNET6 delete subnet by prefix: %1
+Debug message issued when triggered an action to delete subnet by prefix
+
+% MYSQL_CB_DELETE_BY_PREFIX_SUBNET6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete subnet by prefix
+
+% MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4 delete by subnet id: %1 option code: %2 space: %3
+Debug message issued when triggered an action to delete option by subnet id
+
+% MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete option by subnet id
+
+% MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6 delete by subnet id: %1 option code: %2 space: %3
+Debug message issued when triggered an action to delete option by subnet id
+
+% MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete option by subnet id
+
 % MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4 delete subnet by subnet id: %1
 Debug message issued when triggered an action to delete subnet by subnet id
 
 % MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET4_RESULT deleted: %1 entries
 Debug message indicating the result of an action to delete subnet by subnet id
 
-% MYSQL_CB_DELETE_ALL_SUBNETS4 delete all subnets
-Debug message issued when triggered an action to delete all subnets
+% MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6 delete subnet by subnet id: %1
+Debug message issued when triggered an action to delete subnet by subnet id
 
-% MYSQL_CB_DELETE_ALL_SUBNETS4_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete all subnets
+% MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete subnet by subnet id
 
-% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4 delete shared network: %1 subnets
-Debug message issued when triggered an action to delete shared network subnets
+% MYSQL_CB_DELETE_GLOBAL_PARAMETER4 delete global parameter: %1
+Debug message issued when triggered an action to delete global parameter
 
-% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete shared network subnets
+% MYSQL_CB_DELETE_GLOBAL_PARAMETER4_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete global parameter
 
-% MYSQL_CB_DELETE_SHARED_NETWORK4 delete shared network: %1
-Debug message issued when triggered an action to delete shared network
+% MYSQL_CB_DELETE_GLOBAL_PARAMETER6 delete global parameter: %1
+Debug message issued when triggered an action to delete global parameter
 
-% MYSQL_CB_DELETE_SHARED_NETWORK4_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete shared network
+% MYSQL_CB_DELETE_GLOBAL_PARAMETER6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete global parameter
 
-% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4 delete all shared networks
-Debug message issued when triggered an action to delete all shared networks
+% MYSQL_CB_DELETE_OPTION4 delete option code: %1 space: %2
+Debug message issued when triggered an action to delete option
 
-% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS4_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete all shared networks
+% MYSQL_CB_DELETE_OPTION4_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete option
+
+% MYSQL_CB_DELETE_OPTION6 delete option code: %1 space: %2
+Debug message issued when triggered an action to delete option
+
+% MYSQL_CB_DELETE_OPTION6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete option
 
 % MYSQL_CB_DELETE_OPTION_DEF4 delete option definition code: %1 space: %2
 Debug message issued when triggered an action to delete option definition
@@ -166,17 +189,23 @@ Debug message issued when triggered an action to delete option definition
 % MYSQL_CB_DELETE_OPTION_DEF4_RESULT deleted: %1 entries
 Debug message indicating the result of an action to delete option definition
 
-% MYSQL_CB_DELETE_ALL_OPTION_DEFS4 delete all option definitions
-Debug message issued when triggered an action to delete all option definitions
+% MYSQL_CB_DELETE_OPTION_DEF6 delete option definition code: %1 space: %2
+Debug message issued when triggered an action to delete option definition
 
-% MYSQL_CB_DELETE_ALL_OPTION_DEFS4_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete all option definitions
+% MYSQL_CB_DELETE_OPTION_DEF6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete option definition
 
-% MYSQL_CB_DELETE_OPTION4 delete option code: %1 space: %2
-Debug message issued when triggered an action to delete option
+% MYSQL_CB_DELETE_SHARED_NETWORK4 delete shared network: %1
+Debug message issued when triggered an action to delete shared network
 
-% MYSQL_CB_DELETE_OPTION4_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete option
+% MYSQL_CB_DELETE_SHARED_NETWORK4_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete shared network
+
+% MYSQL_CB_DELETE_SHARED_NETWORK6 delete shared network: %1
+Debug message issued when triggered an action to delete shared network
+
+% MYSQL_CB_DELETE_SHARED_NETWORK6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete shared network
 
 % MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4 delete shared network: %1 option code: %2 space: %3
 Debug message issued when triggered an action to delete shared network option
@@ -184,71 +213,65 @@ Debug message issued when triggered an action to delete shared network option
 % MYSQL_CB_DELETE_SHARED_NETWORK_OPTION4_RESULT deleted: %1 entries
 Debug message indicating the result of an action to delete shared network option
 
-% MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4 delete by subnet id: %1 option code: %2 space: %3
-Debug message issued when triggered an action to delete option by subnet id
-
-% MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION4_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete option by subnet id
+% MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6 delete shared network: %1 option code: %2 space: %3
+Debug message issued when triggered an action to delete shared network option
 
-% MYSQL_CB_DELETE_BY_POOL_OPTION4 delete pool start: %1 pool end: %2 option code: %3 space: %4
-Debug message issued when triggered an action to delete option by pool
+% MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete shared network option
 
-% MYSQL_CB_DELETE_BY_POOL_OPTION4_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete option by pool
+% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4 delete shared network: %1 subnets
+Debug message issued when triggered an action to delete shared network subnets
 
-% MYSQL_CB_DELETE_GLOBAL_PARAMETER4 delete global parameter: %1
-Debug message issued when triggered an action to delete global parameter
-
-% MYSQL_CB_DELETE_GLOBAL_PARAMETER4_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete global parameter
+% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS4_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete shared network subnets
 
-% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4 delete all global parameters
-Debug message issued when triggered an action to delete all global parameters
+% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6 delete shared network: %1 subnets
+Debug message issued when triggered an action to delete shared network subnets
 
-% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS4_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete all global parameters
+% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6_RESULT deleted: %1 entries
+Debug message indicating the result of an action to delete shared network subnets
 
-% MYSQL_CB_GET_TYPE4 get type
-Debug message issued when triggered an action to retrieve type
+% MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4 retrieving all global parameters
+Debug message issued when triggered an action to retrieve all global parameters
 
-% MYSQL_CB_GET_HOST4 get host
-Debug message issued when triggered an action to retrieve host
+% MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS4_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve all global parameters
 
-% MYSQL_CB_GET_PORT4 get port
-Debug message issued when triggered an action to retrieve port
+% MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6 retrieving all global parameters
+Debug message issued when triggered an action to retrieve all global parameters
 
-% MYSQL_CB_REGISTER_BACKEND_TYPE4 register backend
-Debug message issued when triggered an action to register backend
+% MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve all global parameters
 
-% MYSQL_CB_UNREGISTER_BACKEND_TYPE4 unregister backend
-Debug message issued when triggered an action to unregister backend
+% MYSQL_CB_GET_ALL_OPTIONS4 retrieving all options
+Debug message issued when triggered an action to retrieve all options
 
-% MYSQL_CB_GET_SUBNET6_BY_PREFIX retrieving subnet by prefix: %1
-Debug message issued when triggered an action to retrieve subnet by prefix
+% MYSQL_CB_GET_ALL_OPTIONS4_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve all options
 
-% MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID retrieving subnet by subnet id: %1
-Debug message issued when triggered an action to retrieve subnet by subnet id
+% MYSQL_CB_GET_ALL_OPTIONS6 retrieving all options
+Debug message issued when triggered an action to retrieve all options
 
-% MYSQL_CB_GET_ALL_SUBNETS6 retrieving all subnets
-Debug message issued when triggered an action to retrieve all subnets
+% MYSQL_CB_GET_ALL_OPTIONS6_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve all options
 
-% MYSQL_CB_GET_ALL_SUBNETS6_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve all subnets
+% MYSQL_CB_GET_ALL_OPTION_DEFS4 retrieving all option definitions
+Debug message issued when triggered an action to retrieve all option definitions
 
-% MYSQL_CB_GET_MODIFIED_SUBNETS6 retrieving modified subnets from: %1
-Debug message issued when triggered an action to retrieve modified subnets from specified time
+% MYSQL_CB_GET_ALL_OPTION_DEFS4_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve all option definitions
 
-% MYSQL_CB_GET_MODIFIED_SUBNETS6_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve modified subnets from specified time
+% MYSQL_CB_GET_ALL_OPTION_DEFS6 retrieving all option definitions
+Debug message issued when triggered an action to retrieve all option definitions
 
-% MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6 retrieving shared network: %1 subnets
-Debug message issued when triggered an action to retrieve shared network subnets
+% MYSQL_CB_GET_ALL_OPTION_DEFS6_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve all option definitions
 
-% MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve shared network subnets
+% MYSQL_CB_GET_ALL_SHARED_NETWORKS4 retrieving all shared networks
+Debug message issued when triggered an action to retrieve all shared networks
 
-% MYSQL_CB_GET_SHARED_NETWORK6 retrieving shared network: %1
-Debug message issued when triggered an action to retrieve shared network
+% MYSQL_CB_GET_ALL_SHARED_NETWORKS4_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve all shared networks
 
 % MYSQL_CB_GET_ALL_SHARED_NETWORKS6 retrieving all shared networks
 Debug message issued when triggered an action to retrieve all shared networks
@@ -256,191 +279,168 @@ Debug message issued when triggered an action to retrieve all shared networks
 % MYSQL_CB_GET_ALL_SHARED_NETWORKS6_RESULT retrieving: %1 elements
 Debug message indicating the result of an action to retrieve all shared networks
 
-% MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6 retrieving modified shared networks from: %1
-Debug message issued when triggered an action to retrieve modified shared networks from specified time
-
-% MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve modified shared networks from specified time
-
-% MYSQL_CB_GET_OPTION_DEF6 retrieving option definition code: %1 space: %2
-Debug message issued when triggered an action to retrieve option definition
-
-% MYSQL_CB_GET_ALL_OPTION_DEFS6 retrieving all option definitions
-Debug message issued when triggered an action to retrieve all option definitions
-
-% MYSQL_CB_GET_ALL_OPTION_DEFS6_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve all option definitions
-
-% MYSQL_CB_GET_MODIFIED_OPTION_DEFS6 retrieving modified option definitions from: %1
-Debug message issued when triggered an action to retrieve modified option definitions from specified time
-
-% MYSQL_CB_GET_MODIFIED_OPTION_DEFS6_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve modified option definitions from specified time
-
-% MYSQL_CB_GET_OPTION6 retrieving option code: %1 space: %2
-Debug message issued when triggered an action to retrieve option
+% MYSQL_CB_GET_ALL_SUBNETS4 retrieving all subnets
+Debug message issued when triggered an action to retrieve all subnets
 
-% MYSQL_CB_GET_ALL_OPTIONS6 retrieving all options
-Debug message issued when triggered an action to retrieve all options
+% MYSQL_CB_GET_ALL_SUBNETS4_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve all subnets
 
-% MYSQL_CB_GET_ALL_OPTIONS6_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve all options
+% MYSQL_CB_GET_ALL_SUBNETS6 retrieving all subnets
+Debug message issued when triggered an action to retrieve all subnets
 
-% MYSQL_CB_GET_MODIFIED_OPTIONS6 retrieving modified options from: %1
-Debug message issued when triggered an action to retrieve modified options from specified time
+% MYSQL_CB_GET_ALL_SUBNETS6_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve all subnets
 
-% MYSQL_CB_GET_MODIFIED_OPTIONS6_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve modified options from specified time
+% MYSQL_CB_GET_GLOBAL_PARAMETER4 retrieving global parameter: %1
+Debug message issued when triggered an action to retrieve global parameter
 
 % MYSQL_CB_GET_GLOBAL_PARAMETER6 retrieving global parameter: %1
 Debug message issued when triggered an action to retrieve global parameter
 
-% MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6 retrieving all global parameters
-Debug message issued when triggered an action to retrieve all global parameters
+% MYSQL_CB_GET_HOST4 get host
+Debug message issued when triggered an action to retrieve host
 
-% MYSQL_CB_GET_ALL_GLOBAL_PARAMETERS6_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve all global parameters
+% MYSQL_CB_GET_HOST6 get host
+Debug message issued when triggered an action to retrieve host
 
-% MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6 retrieving modified global parameters from: %1
+% MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4 retrieving modified global parameters from: %1
 Debug message issued when triggered an action to retrieve modified global parameters from specified time
 
-% MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6_RESULT retrieving: %1 elements
+% MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS4_RESULT retrieving: %1 elements
 Debug message indicating the result of an action to retrieve modified global parameters from specified time
 
-% MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6 retrieving audit entries from: %1
-Debug message issued when triggered an action to retrieve audit entries from specified time
-
-% MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6_RESULT retrieving: %1 elements
-Debug message indicating the result of an action to retrieve audit entries from specified time
-
-% MYSQL_CB_CREATE_UPDATE_SUBNET6 create or update subnet: %1
-Debug message issued when triggered an action to create or update subnet
+% MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6 retrieving modified global parameters from: %1
+Debug message issued when triggered an action to retrieve modified global parameters from specified time
 
-% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK6 create or update shared network: %1
-Debug message issued when triggered an action to create or update shared network
+% MYSQL_CB_GET_MODIFIED_GLOBAL_PARAMETERS6_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve modified global parameters from specified time
 
-% MYSQL_CB_CREATE_UPDATE_OPTION_DEF6 create or update option definition: %1 code: %2
-Debug message issued when triggered an action to create or update option definition
+% MYSQL_CB_GET_MODIFIED_OPTIONS4 retrieving modified options from: %1
+Debug message issued when triggered an action to retrieve modified options from specified time
 
-% MYSQL_CB_CREATE_UPDATE_OPTION6 create or update option
-Debug message issued when triggered an action to create or update option
+% MYSQL_CB_GET_MODIFIED_OPTIONS4_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve modified options from specified time
 
-% MYSQL_CB_CREATE_UPDATE_SHARED_NETWORK_OPTION6 create or update shared network: %1 option
-Debug message issued when triggered an action to create or update shared network option
+% MYSQL_CB_GET_MODIFIED_OPTIONS6 retrieving modified options from: %1
+Debug message issued when triggered an action to retrieve modified options from specified time
 
-% MYSQL_CB_CREATE_UPDATE_BY_SUBNET_ID_OPTION6 create or update option by subnet id: %1
-Debug message issued when triggered an action to create or update option by subnet id
+% MYSQL_CB_GET_MODIFIED_OPTIONS6_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve modified options from specified time
 
-% MYSQL_CB_CREATE_UPDATE_BY_POOL_OPTION6 create or update option pool start: %1 pool end: %2
-Debug message issued when triggered an action to create or update option by pool
+% MYSQL_CB_GET_MODIFIED_OPTION_DEFS4 retrieving modified option definitions from: %1
+Debug message issued when triggered an action to retrieve modified option definitions from specified time
 
-% MYSQL_CB_CREATE_UPDATE_BY_PREFIX_OPTION6 create or update option prefix: %1 prefix len: %2
-Debug message issued when triggered an action to create or update option by prefix
+% MYSQL_CB_GET_MODIFIED_OPTION_DEFS4_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve modified option definitions from specified time
 
-% MYSQL_CB_CREATE_UPDATE_GLOBAL_PARAMETER6 create or update global parameter: %1
-Debug message issued when triggered an action to create or update global parameter
+% MYSQL_CB_GET_MODIFIED_OPTION_DEFS6 retrieving modified option definitions from: %1
+Debug message issued when triggered an action to retrieve modified option definitions from specified time
 
-% MYSQL_CB_DELETE_BY_PREFIX_SUBNET6 delete subnet by prefix: %1
-Debug message issued when triggered an action to delete subnet by prefix
+% MYSQL_CB_GET_MODIFIED_OPTION_DEFS6_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve modified option definitions from specified time
 
-% MYSQL_CB_DELETE_BY_PREFIX_SUBNET6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete subnet by prefix
+% MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4 retrieving modified shared networks from: %1
+Debug message issued when triggered an action to retrieve modified shared networks from specified time
 
-% MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6 delete subnet by subnet id: %1
-Debug message issued when triggered an action to delete subnet by subnet id
+% MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS4_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve modified shared networks from specified time
 
-% MYSQL_CB_DELETE_BY_SUBNET_ID_SUBNET6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete subnet by subnet id
+% MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6 retrieving modified shared networks from: %1
+Debug message issued when triggered an action to retrieve modified shared networks from specified time
 
-% MYSQL_CB_DELETE_ALL_SUBNETS6 delete all subnets
-Debug message issued when triggered an action to delete all subnets
+% MYSQL_CB_GET_MODIFIED_SHARED_NETWORKS6_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve modified shared networks from specified time
 
-% MYSQL_CB_DELETE_ALL_SUBNETS6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete all subnets
+% MYSQL_CB_GET_MODIFIED_SUBNETS4 retrieving modified subnets from: %1
+Debug message issued when triggered an action to retrieve modified subnets from specified time
 
-% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6 delete shared network: %1 subnets
-Debug message issued when triggered an action to delete shared network subnets
+% MYSQL_CB_GET_MODIFIED_SUBNETS4_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve modified subnets from specified time
 
-% MYSQL_CB_DELETE_SHARED_NETWORK_SUBNETS6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete shared network subnets
+% MYSQL_CB_GET_MODIFIED_SUBNETS6 retrieving modified subnets from: %1
+Debug message issued when triggered an action to retrieve modified subnets from specified time
 
-% MYSQL_CB_DELETE_SHARED_NETWORK6 delete shared network: %1
-Debug message issued when triggered an action to delete shared network
+% MYSQL_CB_GET_MODIFIED_SUBNETS6_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve modified subnets from specified time
 
-% MYSQL_CB_DELETE_SHARED_NETWORK6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete shared network
+% MYSQL_CB_GET_OPTION4 retrieving option code: %1 space: %2
+Debug message issued when triggered an action to retrieve option
 
-% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6 delete all shared networks
-Debug message issued when triggered an action to delete all shared networks
+% MYSQL_CB_GET_OPTION6 retrieving option code: %1 space: %2
+Debug message issued when triggered an action to retrieve option
 
-% MYSQL_CB_DELETE_ALL_SHARED_NETWORKS6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete all shared networks
+% MYSQL_CB_GET_OPTION_DEF4 retrieving option definition code: %1 space: %2
+Debug message issued when triggered an action to retrieve option definition
 
-% MYSQL_CB_DELETE_OPTION_DEF6 delete option definition code: %1 space: %2
-Debug message issued when triggered an action to delete option definition
+% MYSQL_CB_GET_OPTION_DEF6 retrieving option definition code: %1 space: %2
+Debug message issued when triggered an action to retrieve option definition
 
-% MYSQL_CB_DELETE_OPTION_DEF6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete option definition
+% MYSQL_CB_GET_PORT4 get port
+Debug message issued when triggered an action to retrieve port
 
-% MYSQL_CB_DELETE_ALL_OPTION_DEFS6 delete all option definitions
-Debug message issued when triggered an action to delete all option definitions
+% MYSQL_CB_GET_PORT6 get port
+Debug message issued when triggered an action to retrieve port
 
-% MYSQL_CB_DELETE_ALL_OPTION_DEFS6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete all option definitions
+% MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4 retrieving audit entries from: %1
+Debug message issued when triggered an action to retrieve audit entries from specified time
 
-% MYSQL_CB_DELETE_OPTION6 delete option code: %1 space: %2
-Debug message issued when triggered an action to delete option
+% MYSQL_CB_GET_RECENT_AUDIT_ENTRIES4_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve audit entries from specified time
 
-% MYSQL_CB_DELETE_OPTION6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete option
+% MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6 retrieving audit entries from: %1
+Debug message issued when triggered an action to retrieve audit entries from specified time
 
-% MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6 delete shared network: %1 option code: %2 space: %3
-Debug message issued when triggered an action to delete shared network option
+% MYSQL_CB_GET_RECENT_AUDIT_ENTRIES6_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve audit entries from specified time
 
-% MYSQL_CB_DELETE_SHARED_NETWORK_OPTION6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete shared network option
+% MYSQL_CB_GET_SHARED_NETWORK4 retrieving shared network: %1
+Debug message issued when triggered an action to retrieve shared network
 
-% MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6 delete by subnet id: %1 option code: %2 space: %3
-Debug message issued when triggered an action to delete option by subnet id
+% MYSQL_CB_GET_SHARED_NETWORK6 retrieving shared network: %1
+Debug message issued when triggered an action to retrieve shared network
 
-% MYSQL_CB_DELETE_BY_SUBNET_ID_OPTION6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete option by subnet id
+% MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4 retrieving shared network: %1 subnets
+Debug message issued when triggered an action to retrieve shared network subnets
 
-% MYSQL_CB_DELETE_BY_POOL_OPTION6 delete pool start: %1 pool end: %2 option code: %3 space: %4
-Debug message issued when triggered an action to delete option by pool
+% MYSQL_CB_GET_SHARED_NETWORK_SUBNETS4_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve shared network subnets
 
-% MYSQL_CB_DELETE_BY_POOL_OPTION6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete option by pool
+% MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6 retrieving shared network: %1 subnets
+Debug message issued when triggered an action to retrieve shared network subnets
 
-% MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6 delete prefix: %1 prefix len: %2 option code: %3 space: %4
-Debug message issued when triggered an action to delete option by prefix
+% MYSQL_CB_GET_SHARED_NETWORK_SUBNETS6_RESULT retrieving: %1 elements
+Debug message indicating the result of an action to retrieve shared network subnets
 
-% MYSQL_CB_DELETE_BY_POOL_PREFIX_OPTION6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete option by prefix
+% MYSQL_CB_GET_SUBNET4_BY_PREFIX retrieving subnet by prefix: %1
+Debug message issued when triggered an action to retrieve subnet by prefix
 
-% MYSQL_CB_DELETE_GLOBAL_PARAMETER6 delete global parameter: %1
-Debug message issued when triggered an action to delete global parameter
+% MYSQL_CB_GET_SUBNET4_BY_SUBNET_ID retrieving subnet by subnet id: %1
+Debug message issued when triggered an action to retrieve subnet by subnet id
 
-% MYSQL_CB_DELETE_GLOBAL_PARAMETER6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete global parameter
+% MYSQL_CB_GET_SUBNET6_BY_PREFIX retrieving subnet by prefix: %1
+Debug message issued when triggered an action to retrieve subnet by prefix
 
-% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6 delete all global parameters
-Debug message issued when triggered an action to delete all global parameters
+% MYSQL_CB_GET_SUBNET6_BY_SUBNET_ID retrieving subnet by subnet id: %1
+Debug message issued when triggered an action to retrieve subnet by subnet id
 
-% MYSQL_CB_DELETE_ALL_GLOBAL_PARAMETERS6_RESULT deleted: %1 entries
-Debug message indicating the result of an action to delete all global parameters
+% MYSQL_CB_GET_TYPE4 get type
+Debug message issued when triggered an action to retrieve type
 
 % MYSQL_CB_GET_TYPE6 get type
 Debug message issued when triggered an action to retrieve type
 
-% MYSQL_CB_GET_HOST6 get host
-Debug message issued when triggered an action to retrieve host
+% MYSQL_CB_INIT_OK loading MYSQL CB hooks library successful
+This informational message indicates that the MySQL Configuration Backend hooks
+library has been loaded successfully.
 
-% MYSQL_CB_GET_PORT6 get port
-Debug message issued when triggered an action to retrieve port
+% MYSQL_CB_REGISTER_BACKEND_TYPE4 register backend
+Debug message issued when triggered an action to register backend
 
 % MYSQL_CB_REGISTER_BACKEND_TYPE6 register backend
 Debug message issued when triggered an action to register backend
 
+% MYSQL_CB_UNREGISTER_BACKEND_TYPE4 unregister backend
+Debug message issued when triggered an action to unregister backend
+
 % MYSQL_CB_UNREGISTER_BACKEND_TYPE6 unregister backend
 Debug message issued when triggered an action to unregister backend
diff --git a/src/lib/asiolink/tests/unix_domain_socket_unittest.cc b/src/lib/asiolink/tests/unix_domain_socket_unittest.cc
index 544948a582..a147e3bb8c 100644
--- a/src/lib/asiolink/tests/unix_domain_socket_unittest.cc
+++ b/src/lib/asiolink/tests/unix_domain_socket_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2019 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/config/tests/client_connection_unittests.cc b/src/lib/config/tests/client_connection_unittests.cc
index c741b6cae7..3ecca82071 100644
--- a/src/lib/config/tests/client_connection_unittests.cc
+++ b/src/lib/config/tests/client_connection_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2019 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/config/tests/command_mgr_unittests.cc b/src/lib/config/tests/command_mgr_unittests.cc
index a2101c11c6..63fcaf0fcb 100644
--- a/src/lib/config/tests/command_mgr_unittests.cc
+++ b/src/lib/config/tests/command_mgr_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2019 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/cql/cql_connection.cc b/src/lib/cql/cql_connection.cc
index ae3ea48767..481c6e9f4c 100644
--- a/src/lib/cql/cql_connection.cc
+++ b/src/lib/cql/cql_connection.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC")
 // Copyright (C) 2015-2018 Deutsche Telekom AG.
 //
 // Authors: Razvan Becheriu <razvan.becheriu@qualitance.com>
diff --git a/src/lib/cql/cql_connection.h b/src/lib/cql/cql_connection.h
index 0a6bdc67ce..dde9ee9ae3 100644
--- a/src/lib/cql/cql_connection.h
+++ b/src/lib/cql/cql_connection.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC")
 // Copyright (C) 2015-2017 Deutsche Telekom AG.
 //
 // Authors: Razvan Becheriu <razvan.becheriu@qualitance.com>
diff --git a/src/lib/cql/cql_exchange.cc b/src/lib/cql/cql_exchange.cc
index 59fd38bbb4..61d0bb707a 100644
--- a/src/lib/cql/cql_exchange.cc
+++ b/src/lib/cql/cql_exchange.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC")
 // Copyright (C) 2016-2017 Deutsche Telekom AG.
 //
 // Authors: Razvan Becheriu <razvan.becheriu@qualitance.com>
diff --git a/src/lib/cql/tests/cql_connection_unittest.cc b/src/lib/cql/tests/cql_connection_unittest.cc
index 6fe2b7b9bc..4d7a323c30 100644
--- a/src/lib/cql/tests/cql_connection_unittest.cc
+++ b/src/lib/cql/tests/cql_connection_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC")
 // Copyright (C) 2017 Deutsche Telekom AG.
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/src/lib/database/database_connection.cc b/src/lib/database/database_connection.cc
index c13484d193..de5b5fac8a 100644
--- a/src/lib/database/database_connection.cc
+++ b/src/lib/database/database_connection.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2019 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/database/database_connection.h b/src/lib/database/database_connection.h
index c673111f50..22336b66bd 100644
--- a/src/lib/database/database_connection.h
+++ b/src/lib/database/database_connection.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2019 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/database/db_log.cc b/src/lib/database/db_log.cc
index b86ac9339a..58f602f814 100644
--- a/src/lib/database/db_log.cc
+++ b/src/lib/database/db_log.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/database/dbaccess_parser.h b/src/lib/database/dbaccess_parser.h
index a6f9d4fcb2..2e55d20ea6 100644
--- a/src/lib/database/dbaccess_parser.h
+++ b/src/lib/database/dbaccess_parser.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/database/tests/database_connection_unittest.cc b/src/lib/database/tests/database_connection_unittest.cc
index ada2232479..c644e7e139 100644
--- a/src/lib/database/tests/database_connection_unittest.cc
+++ b/src/lib/database/tests/database_connection_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2019 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/database/testutils/schema.cc b/src/lib/database/testutils/schema.cc
index 7e95545ba5..f3db8ba64b 100644
--- a/src/lib/database/testutils/schema.cc
+++ b/src/lib/database/testutils/schema.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2019 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/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc
index 81abee5303..7eabbaa76c 100644
--- a/src/lib/dhcp/libdhcp++.cc
+++ b/src/lib/dhcp/libdhcp++.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2019 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/pkt_filter_inet6.cc b/src/lib/dhcp/pkt_filter_inet6.cc
index 939be3c819..bfa395d2f2 100644
--- a/src/lib/dhcp/pkt_filter_inet6.cc
+++ b/src/lib/dhcp/pkt_filter_inet6.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/pkt_filter_inet6.h b/src/lib/dhcp/pkt_filter_inet6.h
index 39a059d73d..55b9285441 100644
--- a/src/lib/dhcp/pkt_filter_inet6.h
+++ b/src/lib/dhcp/pkt_filter_inet6.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2019 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/tests/option_definition_unittest.cc b/src/lib/dhcp/tests/option_definition_unittest.cc
index 778fd38f87..c31cbb9fe7 100644
--- a/src/lib/dhcp/tests/option_definition_unittest.cc
+++ b/src/lib/dhcp/tests/option_definition_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/tests/option_unittest.cc b/src/lib/dhcp/tests/option_unittest.cc
index adc08f1815..9fbbc4f9f9 100644
--- a/src/lib/dhcp/tests/option_unittest.cc
+++ b/src/lib/dhcp/tests/option_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2019 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/benchmarks/benchmarks.dox b/src/lib/dhcpsrv/benchmarks/benchmarks.dox
index 09f69dbb6c..0cd444452f 100644
--- a/src/lib/dhcpsrv/benchmarks/benchmarks.dox
+++ b/src/lib/dhcpsrv/benchmarks/benchmarks.dox
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/benchmarks/parameters.h b/src/lib/dhcpsrv/benchmarks/parameters.h
index 2f54c28351..c8f93524ba 100644
--- a/src/lib/dhcpsrv/benchmarks/parameters.h
+++ b/src/lib/dhcpsrv/benchmarks/parameters.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/cfg_4o6.cc b/src/lib/dhcpsrv/cfg_4o6.cc
index c37d773479..3f69d3b936 100644
--- a/src/lib/dhcpsrv/cfg_4o6.cc
+++ b/src/lib/dhcpsrv/cfg_4o6.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2019 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/cql_lease_mgr.cc b/src/lib/dhcpsrv/cql_lease_mgr.cc
index 46a00877d7..a80d3f2dee 100644
--- a/src/lib/dhcpsrv/cql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/cql_lease_mgr.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2019 Internet Systems Consortium, Inc. ("ISC")
 // Copyright (C) 2015-2018 Deutsche Telekom AG.
 //
 // Authors: Razvan Becheriu <razvan.becheriu@qualitance.com>
diff --git a/src/lib/dhcpsrv/cql_lease_mgr.h b/src/lib/dhcpsrv/cql_lease_mgr.h
index f8b8450a90..ae042b3c46 100644
--- a/src/lib/dhcpsrv/cql_lease_mgr.h
+++ b/src/lib/dhcpsrv/cql_lease_mgr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC")
 // Copyright (C) 2015-2018 Deutsche Telekom AG.
 //
 // Authors: Razvan Becheriu <razvan.becheriu@qualitance.com>
diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes
index 845f6be5bc..6ad1ef292a 100644
--- a/src/lib/dhcpsrv/dhcpsrv_messages.mes
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes
@@ -100,16 +100,6 @@ contains "ip-address" rather than its replacement, "ip-addresses".
 The server will still honor the value but users are encouraged to
 move to the new list parameter.
 
-% DHCPSRV_CFGMGR_UPDATE_SUBNET4 updating subnet %1 (result %2)
-A debug message reported when the DHCP configuration manager is updating the
-specified IPv4 subnet in its current configuration. Subnet ID and result
-(expected to be true) are displayed.
-
-% DHCPSRV_CFGMGR_UPDATE_SUBNET6 updating subnet %1 (result %2)
-A debug message reported when the DHCP configuration manager is replacing the
-specified IPv6 subnet in its current configuration.  Subnet ID and result
-(expected to be true) are displayed.
-
 % DHCPSRV_CFGMGR_SOCKET_RAW_UNSUPPORTED use of raw sockets is unsupported on this OS, UDP sockets will be used
 This warning message is logged when the user specified that the
 DHCPv4 server should use the raw sockets to receive the DHCP
@@ -188,6 +178,16 @@ This warning message is logged when user specified a link-local address to
 receive unicast traffic. The warning message is issued because it is an
 uncommon use.
 
+% DHCPSRV_CFGMGR_UPDATE_SUBNET4 updating subnet %1 (result %2)
+A debug message reported when the DHCP configuration manager is updating the
+specified IPv4 subnet in its current configuration. Subnet ID and result
+(expected to be true) are displayed.
+
+% DHCPSRV_CFGMGR_UPDATE_SUBNET6 updating subnet %1 (result %2)
+A debug message reported when the DHCP configuration manager is replacing the
+specified IPv6 subnet in its current configuration.  Subnet ID and result
+(expected to be true) are displayed.
+
 % DHCPSRV_CFGMGR_USE_ADDRESS listening on address %1, on interface %2
 A message issued when the server is configured to listen on the explicitly specified
 IP address on the given interface.
diff --git a/src/lib/dhcpsrv/hosts_messages.mes b/src/lib/dhcpsrv/hosts_messages.mes
index 1be847bb16..d6dc7542aa 100644
--- a/src/lib/dhcpsrv/hosts_messages.mes
+++ b/src/lib/dhcpsrv/hosts_messages.mes
@@ -92,10 +92,28 @@ description of the host found.
 This debug message is issued when starting to retrieve all hosts connected to
 the specific DHCPv4 subnet. The argument specifies subnet id.
 
+% HOSTS_CFG_GET_ALL_SUBNET_ID4_COUNT using IPv4 subnet %1, found %2 host(s)
+This debug message include the details of the host found using the DHCPv4
+subnet id. The arguments specify subnet id and the number of hosts found
+respectively.
+
+% HOSTS_CFG_GET_ALL_SUBNET_ID4_HOST using IPv4 subnet %1, found host: %2
+This debug message includes the details of the host found using the DHCPv4
+subnet id. The arguments specify subnet id and found host details respectively.
+
 % HOSTS_CFG_GET_ALL_SUBNET_ID6 get all hosts with reservations for IPv6 subnet %1
 This debug message is issued when starting to retrieve all hosts connected to
 the specific DHCPv6 subnet. The argument specifies subnet id.
 
+% HOSTS_CFG_GET_ALL_SUBNET_ID6_COUNT using IPv6 subnet %1, found %2 host(s)
+This debug message include the details of the host found using the DHCPv6
+subnet id. The arguments specify subnet id and the number of hosts found
+respectively.
+
+% HOSTS_CFG_GET_ALL_SUBNET_ID6_HOST using IPv6 subnet %1, found host: %2
+This debug message includes the details of the host found using the DHCPv6
+subnet id. The arguments specify subnet id and found host details respectively.
+
 % HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS6 get all hosts with reservations for subnet id %1 and IPv6 address %2
 This debug message is issued when starting to retrieve all hosts connected to
 the specific subnet and having the specific IPv6 address reserved.
@@ -112,24 +130,6 @@ subnet id and address. The arguments specify subnet id, address and
 the number of hosts found respectively.
 found host details respectively.
 
-% HOSTS_CFG_GET_ALL_SUBNET_ID4_COUNT using IPv4 subnet %1, found %2 host(s)
-This debug message include the details of the host found using the DHCPv4
-subnet id. The arguments specify subnet id and the number of hosts found
-respectively.
-
-% HOSTS_CFG_GET_ALL_SUBNET_ID6_COUNT using IPv6 subnet %1, found %2 host(s)
-This debug message include the details of the host found using the DHCPv6
-subnet id. The arguments specify subnet id and the number of hosts found
-respectively.
-
-% HOSTS_CFG_GET_ALL_SUBNET_ID4_HOST using IPv4 subnet %1, found host: %2
-This debug message includes the details of the host found using the DHCPv4
-subnet id. The arguments specify subnet id and found host details respectively.
-
-% HOSTS_CFG_GET_ALL_SUBNET_ID6_HOST using IPv6 subnet %1, found host: %2
-This debug message includes the details of the host found using the DHCPv6
-subnet id. The arguments specify subnet id and found host details respectively.
-
 % HOSTS_CFG_GET_ONE_PREFIX get one host with reservation for prefix %1/%2
 This debug message is issued when starting to retrieve a host having a
 reservation for a specified prefix. The arguments specify a prefix and
diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc
index d060e22057..e632ada8e5 100644
--- a/src/lib/dhcpsrv/memfile_lease_mgr.cc
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc
index ef41e92e04..8d73ea643b 100644
--- a/src/lib/dhcpsrv/mysql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/tests/alloc_engine_utils.cc b/src/lib/dhcpsrv/tests/alloc_engine_utils.cc
index 8cf14e0a89..a85b42d76a 100644
--- a/src/lib/dhcpsrv/tests/alloc_engine_utils.cc
+++ b/src/lib/dhcpsrv/tests/alloc_engine_utils.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/tests/alloc_engine_utils.h b/src/lib/dhcpsrv/tests/alloc_engine_utils.h
index 8ec38afe15..cd23b1c06a 100644
--- a/src/lib/dhcpsrv/tests/alloc_engine_utils.h
+++ b/src/lib/dhcpsrv/tests/alloc_engine_utils.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2019 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/tests/cfg_iface_unittest.cc b/src/lib/dhcpsrv/tests/cfg_iface_unittest.cc
index abaceed33f..a6aa610f19 100644
--- a/src/lib/dhcpsrv/tests/cfg_iface_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_iface_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2019 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/tests/cql_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc
index 25c2f49825..0c5e946eac 100644
--- a/src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2019 Internet Systems Consortium, Inc. ("ISC")
 // Copyright (C) 2015-2017 Deutsche Telekom AG.
 //
 // Authors: Razvan Becheriu <razvan.becheriu@qualitance.com>
diff --git a/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.h b/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.h
index dfc92e7ccc..b60691fb39 100644
--- a/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.h
+++ b/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2019 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/tests/test_utils.h b/src/lib/dhcpsrv/tests/test_utils.h
index 1a04964870..8dd67cde01 100644
--- a/src/lib/dhcpsrv/tests/test_utils.h
+++ b/src/lib/dhcpsrv/tests/test_utils.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/testutils/host_data_source_utils.cc b/src/lib/dhcpsrv/testutils/host_data_source_utils.cc
index 09395a79d0..e69dea083c 100644
--- a/src/lib/dhcpsrv/testutils/host_data_source_utils.cc
+++ b/src/lib/dhcpsrv/testutils/host_data_source_utils.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/dns/name.h b/src/lib/dns/name.h
index 8871cd9889..0720684097 100644
--- a/src/lib/dns/name.h
+++ b/src/lib/dns/name.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2009-2019 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/http/http_messages.mes b/src/lib/http/http_messages.mes
index 5ba4614777..de00e53909 100644
--- a/src/lib/http/http_messages.mes
+++ b/src/lib/http/http_messages.mes
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2018 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2019 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/mysql/mysql_connection.cc b/src/lib/mysql/mysql_connection.cc
index 0e9f001d5b..8efc9a06ca 100644
--- a/src/lib/mysql/mysql_connection.cc
+++ b/src/lib/mysql/mysql_connection.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 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/process/process_messages.mes b/src/lib/process/process_messages.mes
index fe39c53bb3..e130e7d53c 100644
--- a/src/lib/process/process_messages.mes
+++ b/src/lib/process/process_messages.mes
@@ -49,14 +49,14 @@ new configuration. It is output during server startup, and when an updated
 configuration is committed by the administrator.  Additional information
 may be provided.
 
-% DCTL_CONFIG_FETCH Fetching configuration data from config backends.
-This is an informational message emitted when the Kea server is about to begin
-retrieving configuration data from one or more configuration backends.
-
 % DCTL_CONFIG_DEPRECATED server configuration includes a deprecated object: %1
 This warning message is issued when the configuration includes a deprecated
 object (i.e. a top level element) which will be ignored.
 
+% DCTL_CONFIG_FETCH Fetching configuration data from config backends.
+This is an informational message emitted when the Kea server is about to begin
+retrieving configuration data from one or more configuration backends.
+
 % DCTL_CONFIG_FILE_LOAD_FAIL %1 reason: %2
 This fatal error message indicates that the application attempted to load its
 initial configuration from file and has failed. The service will exit.
diff --git a/src/lib/process/tests/config_ctl_info_unittests.cc b/src/lib/process/tests/config_ctl_info_unittests.cc
index 8c8d6c980c..d7416592bb 100644
--- a/src/lib/process/tests/config_ctl_info_unittests.cc
+++ b/src/lib/process/tests/config_ctl_info_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/util/io/fd_share.cc b/src/lib/util/io/fd_share.cc
index a57fc54ee2..6edffd301e 100644
--- a/src/lib/util/io/fd_share.cc
+++ b/src/lib/util/io/fd_share.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010-2019 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/util/tests/socketsession_unittest.cc b/src/lib/util/tests/socketsession_unittest.cc
index 4df14ee6ae..7892399289 100644
--- a/src/lib/util/tests/socketsession_unittest.cc
+++ b/src/lib/util/tests/socketsession_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2019 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/yang/translator.cc b/src/lib/yang/translator.cc
index c22d805076..d2983ccd49 100644
--- a/src/lib/yang/translator.cc
+++ b/src/lib/yang/translator.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/yang/translator_database.cc b/src/lib/yang/translator_database.cc
index cea73f9454..deed8c8f68 100644
--- a/src/lib/yang/translator_database.cc
+++ b/src/lib/yang/translator_database.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/yang/translator_database.h b/src/lib/yang/translator_database.h
index 228cbbb2a6..a33da13dbc 100644
--- a/src/lib/yang/translator_database.h
+++ b/src/lib/yang/translator_database.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2019 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/share/database/scripts/cql/dhcpdb_create.cql b/src/share/database/scripts/cql/dhcpdb_create.cql
index 8e8ec9d38f..5886de0ecd 100644
--- a/src/share/database/scripts/cql/dhcpdb_create.cql
+++ b/src/share/database/scripts/cql/dhcpdb_create.cql
@@ -1,4 +1,4 @@
--- Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+-- Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC")
 -- Copyright (C) 2015-2018 Deutsche Telekom AG.
 
 -- Author: Razvan Becheriu <razvan.becheriu@qualitance.com>
diff --git a/src/share/database/scripts/cql/dhcpdb_drop.cql b/src/share/database/scripts/cql/dhcpdb_drop.cql
index 330fcecb63..797ef59906 100644
--- a/src/share/database/scripts/cql/dhcpdb_drop.cql
+++ b/src/share/database/scripts/cql/dhcpdb_drop.cql
@@ -1,4 +1,4 @@
--- Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+-- Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC")
 -- Copyright (C) 2015-2017 Deutsche Telekom AG.
 
 -- Author: Razvan Becheriu <razvan.becheriu@qualitance.com>