diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md
index 72c1ee84c..a3beb0581 100644
--- a/Documentation/Changelog.md
+++ b/Documentation/Changelog.md
@@ -23,6 +23,7 @@
 
 For more details, please refer to:
 
+* [MariaDB MaxScale 2.4.8 Release Notes](Release-Notes/MaxScale-2.4.8-Release-Notes.md)
 * [MariaDB MaxScale 2.4.7 Release Notes](Release-Notes/MaxScale-2.4.7-Release-Notes.md)
 * [MariaDB MaxScale 2.4.6 Release Notes](Release-Notes/MaxScale-2.4.6-Release-Notes.md)
 * [MariaDB MaxScale 2.4.5 Release Notes](Release-Notes/MaxScale-2.4.5-Release-Notes.md)
diff --git a/Documentation/Release-Notes/MaxScale-2.4.8-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.4.8-Release-Notes.md
new file mode 100644
index 000000000..7872cad21
--- /dev/null
+++ b/Documentation/Release-Notes/MaxScale-2.4.8-Release-Notes.md
@@ -0,0 +1,45 @@
+# MariaDB MaxScale 2.4.8 Release Notes
+
+Release 2.4.8 is a GA release.
+
+This document describes the changes in release 2.4.8, when compared to the
+previous release in the same series.
+
+For any problems you encounter, please consider submitting a bug
+report on [our Jira](https://jira.mariadb.org/projects/MXS).
+
+## Bug fixes
+
+* [MXS-2921](https://jira.mariadb.org/browse/MXS-2921) Memory leak in `alter maxscale`
+* [MXS-2919](https://jira.mariadb.org/browse/MXS-2919) max_slave_replication_lag uses servers with unknown replication lag
+* [MXS-2917](https://jira.mariadb.org/browse/MXS-2917) qc_sqlite leaks memory with complex CREATE TABLE query
+* [MXS-2907](https://jira.mariadb.org/browse/MXS-2907) Logrotate warnings when PID file does not exist
+* [MXS-2898](https://jira.mariadb.org/browse/MXS-2898) warning: The query can't be routed to all backend servers because it includes SELECT and SQL variable modifications which is not supported.
+* [MXS-2893](https://jira.mariadb.org/browse/MXS-2893) UnhandledPromiseRejectionWarning when creating a new filter
+* [MXS-2878](https://jira.mariadb.org/browse/MXS-2878) Monitor connections do not insist on SSL being used
+* [MXS-2873](https://jira.mariadb.org/browse/MXS-2873) Router diagnostic output is not documented
+* [MXS-2844](https://jira.mariadb.org/browse/MXS-2844) maxctrl fails to destroy binlogrouter service
+* [MXS-2811](https://jira.mariadb.org/browse/MXS-2811) Cannot configure Connector-C TLS version
+* [MXS-2508](https://jira.mariadb.org/browse/MXS-2508) Using DIV function in query produces an error
+* [MXS-2382](https://jira.mariadb.org/browse/MXS-2382) TLS/SSL setup is not a part of the server mini-tutorial
+* [MXS-2227](https://jira.mariadb.org/browse/MXS-2227) optimize table: Query could not be tokenized/Parsing the query failed, cannot report query type
+
+## Known Issues and Limitations
+
+There are some limitations and known issues within this version of MaxScale.
+For more information, please refer to the [Limitations](../About/Limitations.md) document.
+
+## Packaging
+
+RPM and Debian packages are provided for supported the Linux distributions.
+
+Packages can be downloaded [here](https://mariadb.com/downloads/#mariadb_platform-mariadb_maxscale).
+
+## Source Code
+
+The source code of MaxScale is tagged at GitHub with a tag, which is identical
+with the version of MaxScale. For instance, the tag of version X.Y.Z of MaxScale
+is `maxscale-X.Y.Z`. Further, the default branch is always the latest GA version
+of MaxScale.
+
+The source code is available [here](https://github.com/mariadb-corporation/MaxScale).
diff --git a/LICENSE24.TXT b/LICENSE24.TXT
index 0bb528985..4de1e96bb 100644
--- a/LICENSE24.TXT
+++ b/LICENSE24.TXT
@@ -10,7 +10,7 @@ Additional Use Grant: You may use the Licensed Work when your application
                       uses the Licensed Work with a total of less than three
                       server instances for any purpose.
 
-Change Date:          2024-02-10
+Change Date:          2024-03-10
 
 Change License:       Version 2 or later of the GNU General Public License as
                       published by the Free Software Foundation.
diff --git a/include/maxscale/config2.hh b/include/maxscale/config2.hh
index 7a3cd63f8..4a340d179 100644
--- a/include/maxscale/config2.hh
+++ b/include/maxscale/config2.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/include/maxscale/listener.hh b/include/maxscale/listener.hh
index de2e50937..c24efd138 100644
--- a/include/maxscale/listener.hh
+++ b/include/maxscale/listener.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/include/maxscale/mainworker.hh b/include/maxscale/mainworker.hh
index 961b30458..0690e133b 100644
--- a/include/maxscale/mainworker.hh
+++ b/include/maxscale/mainworker.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/include/maxscale/mysql_plus.hh b/include/maxscale/mysql_plus.hh
index 8c1b6462e..ad87efe96 100644
--- a/include/maxscale/mysql_plus.hh
+++ b/include/maxscale/mysql_plus.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/include/maxscale/packet_tracker.hh b/include/maxscale/packet_tracker.hh
index dc6e7b8d2..074ed07a4 100644
--- a/include/maxscale/packet_tracker.hh
+++ b/include/maxscale/packet_tracker.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/include/maxscale/ssl.hh b/include/maxscale/ssl.hh
index d3f6b62a2..01cfaf7f1 100644
--- a/include/maxscale/ssl.hh
+++ b/include/maxscale/ssl.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxctrl/package-lock.json b/maxctrl/package-lock.json
index 2ce473d3a..7efbb3f6b 100644
--- a/maxctrl/package-lock.json
+++ b/maxctrl/package-lock.json
@@ -2109,9 +2109,9 @@
       }
     },
     "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
     },
     "lcid": {
       "version": "1.0.0",
diff --git a/maxscale-system-test/clustrix_basics.cpp b/maxscale-system-test/clustrix_basics.cpp
index 568557e33..33c037a2a 100644
--- a/maxscale-system-test/clustrix_basics.cpp
+++ b/maxscale-system-test/clustrix_basics.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxscale-system-test/clustrix_distribution.cpp b/maxscale-system-test/clustrix_distribution.cpp
index 27c925e21..2d84ab759 100644
--- a/maxscale-system-test/clustrix_distribution.cpp
+++ b/maxscale-system-test/clustrix_distribution.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxscale-system-test/clustrix_mon.cpp b/maxscale-system-test/clustrix_mon.cpp
index 9bd96fe23..a622141d9 100644
--- a/maxscale-system-test/clustrix_mon.cpp
+++ b/maxscale-system-test/clustrix_mon.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxscale-system-test/clustrix_transaction_replay.cpp b/maxscale-system-test/clustrix_transaction_replay.cpp
index 2d05411d0..c448b5495 100644
--- a/maxscale-system-test/clustrix_transaction_replay.cpp
+++ b/maxscale-system-test/clustrix_transaction_replay.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxscale-system-test/masking_user.sh b/maxscale-system-test/masking_user.sh
index 331e5b30e..b21d7b59f 100755
--- a/maxscale-system-test/masking_user.sh
+++ b/maxscale-system-test/masking_user.sh
@@ -35,7 +35,7 @@ dir="$src_dir/masking/$1"
 user=skysql
 test_name=masking_user
 mysqltest --host=${maxscale_000_network} --port=$port \
-          --user=$maxscale_user --password=$maxscale_password \
+          --user=$user --password=$maxscale_password \
           --logdir=$logdir \
           --test-file=$dir/t/$test_name.test \
           --result-file=$dir/r/"$test_name"_"$user".result \
@@ -51,7 +51,7 @@ fi
 user=maxskysql
 test_name=masking_user
 mysqltest --host=${maxscale_000_network} --port=$port \
-          --user=$maxscale_user --password=$maxscale_password \
+          --user=$user --password=$maxscale_password \
           --logdir=$logdir \
           --test-file=$dir/t/$test_name.test \
           --result-file=$dir/r/"$test_name"_"$user".result \
diff --git a/maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.h b/maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.h
index 400e61665..f2549d28c 100644
--- a/maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.h
+++ b/maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.h
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxscale-system-test/maxtest/include/maxtest/maxrest.hh b/maxscale-system-test/maxtest/include/maxtest/maxrest.hh
index b37823e02..7a812b328 100644
--- a/maxscale-system-test/maxtest/include/maxtest/maxrest.hh
+++ b/maxscale-system-test/maxtest/include/maxtest/maxrest.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxscale-system-test/maxtest/src/clustrix_nodes.cpp b/maxscale-system-test/maxtest/src/clustrix_nodes.cpp
index ed35f0b36..21ffef782 100644
--- a/maxscale-system-test/maxtest/src/clustrix_nodes.cpp
+++ b/maxscale-system-test/maxtest/src/clustrix_nodes.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxscale-system-test/maxtest/src/maxrest.cc b/maxscale-system-test/maxtest/src/maxrest.cc
index 78565deb8..34559f4df 100644
--- a/maxscale-system-test/maxtest/src/maxrest.cc
+++ b/maxscale-system-test/maxtest/src/maxrest.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxscale-system-test/mxs2273_being_drained.cpp b/maxscale-system-test/mxs2273_being_drained.cpp
index 6510071be..e67008a5f 100644
--- a/maxscale-system-test/mxs2273_being_drained.cpp
+++ b/maxscale-system-test/mxs2273_being_drained.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxscale-system-test/mxs2512_trx_replay_rollback.cpp b/maxscale-system-test/mxs2512_trx_replay_rollback.cpp
index 15dcbc664..80e7a9844 100644
--- a/maxscale-system-test/mxs2512_trx_replay_rollback.cpp
+++ b/maxscale-system-test/mxs2512_trx_replay_rollback.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxscale-system-test/mysqlmon_enforce_simple.cpp b/maxscale-system-test/mysqlmon_enforce_simple.cpp
index d76fd7594..e0513876a 100644
--- a/maxscale-system-test/mysqlmon_enforce_simple.cpp
+++ b/maxscale-system-test/mysqlmon_enforce_simple.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxscale-system-test/mysqlmon_fail_switch_multi.cpp b/maxscale-system-test/mysqlmon_fail_switch_multi.cpp
index 2539d716a..5d64ceb64 100644
--- a/maxscale-system-test/mysqlmon_fail_switch_multi.cpp
+++ b/maxscale-system-test/mysqlmon_fail_switch_multi.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxscale-system-test/smart_query.cpp b/maxscale-system-test/smart_query.cpp
index 71bc84f90..50d0f3984 100644
--- a/maxscale-system-test/smart_query.cpp
+++ b/maxscale-system-test/smart_query.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxscale-system-test/sr_basics.cpp b/maxscale-system-test/sr_basics.cpp
index 02ff12e8d..6ae0581c4 100644
--- a/maxscale-system-test/sr_basics.cpp
+++ b/maxscale-system-test/sr_basics.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxbase/include/maxbase/host.hh b/maxutils/maxbase/include/maxbase/host.hh
index c55614d60..e119985ba 100644
--- a/maxutils/maxbase/include/maxbase/host.hh
+++ b/maxutils/maxbase/include/maxbase/host.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxbase/include/maxbase/http.hh b/maxutils/maxbase/include/maxbase/http.hh
index 7757eae80..4a7ba3eb1 100644
--- a/maxutils/maxbase/include/maxbase/http.hh
+++ b/maxutils/maxbase/include/maxbase/http.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxbase/include/maxbase/iterator.hh b/maxutils/maxbase/include/maxbase/iterator.hh
index b520404f5..4e0fdb5b6 100644
--- a/maxutils/maxbase/include/maxbase/iterator.hh
+++ b/maxutils/maxbase/include/maxbase/iterator.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxbase/include/maxbase/pam_utils.hh b/maxutils/maxbase/include/maxbase/pam_utils.hh
index 8dc3129b9..06261bdda 100644
--- a/maxutils/maxbase/include/maxbase/pam_utils.hh
+++ b/maxutils/maxbase/include/maxbase/pam_utils.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxbase/include/maxbase/random.hh b/maxutils/maxbase/include/maxbase/random.hh
index 899c948b6..b48fbac1a 100644
--- a/maxutils/maxbase/include/maxbase/random.hh
+++ b/maxutils/maxbase/include/maxbase/random.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxbase/include/maxbase/string.hh b/maxutils/maxbase/include/maxbase/string.hh
index 0e3db8749..f553be11b 100644
--- a/maxutils/maxbase/include/maxbase/string.hh
+++ b/maxutils/maxbase/include/maxbase/string.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxbase/src/host.cc b/maxutils/maxbase/src/host.cc
index 847a23725..29e3f29cf 100644
--- a/maxutils/maxbase/src/host.cc
+++ b/maxutils/maxbase/src/host.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxbase/src/http.cc b/maxutils/maxbase/src/http.cc
index 5b11bd2a3..4ebaac3d7 100644
--- a/maxutils/maxbase/src/http.cc
+++ b/maxutils/maxbase/src/http.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxbase/src/pam_utils.cc b/maxutils/maxbase/src/pam_utils.cc
index ac8f8a91f..5347cf05d 100644
--- a/maxutils/maxbase/src/pam_utils.cc
+++ b/maxutils/maxbase/src/pam_utils.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxbase/src/random.cc b/maxutils/maxbase/src/random.cc
index 1950b71d5..3edbf9e3a 100644
--- a/maxutils/maxbase/src/random.cc
+++ b/maxutils/maxbase/src/random.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxbase/src/test/test_host_class.cc b/maxutils/maxbase/src/test/test_host_class.cc
index 329b0b5fc..9445b494d 100644
--- a/maxutils/maxbase/src/test/test_host_class.cc
+++ b/maxutils/maxbase/src/test/test_host_class.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxbase/src/test/test_http.cc b/maxutils/maxbase/src/test/test_http.cc
index cf67dc551..65d266bcf 100644
--- a/maxutils/maxbase/src/test/test_http.cc
+++ b/maxutils/maxbase/src/test/test_http.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxbase/src/test/test_name_lookup.cc b/maxutils/maxbase/src/test/test_name_lookup.cc
index ae005aa25..8638a6483 100644
--- a/maxutils/maxbase/src/test/test_name_lookup.cc
+++ b/maxutils/maxbase/src/test/test_name_lookup.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxbase/src/test/test_string.cc b/maxutils/maxbase/src/test/test_string.cc
index 3a61b3fbb..0471fbfa0 100644
--- a/maxutils/maxbase/src/test/test_string.cc
+++ b/maxutils/maxbase/src/test/test_string.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxsql/include/maxsql/mariadb.hh b/maxutils/maxsql/include/maxsql/mariadb.hh
index 61927ab08..7f327eb37 100644
--- a/maxutils/maxsql/include/maxsql/mariadb.hh
+++ b/maxutils/maxsql/include/maxsql/mariadb.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxsql/include/maxsql/queryresult.hh b/maxutils/maxsql/include/maxsql/queryresult.hh
index 1730556eb..72a4bc730 100644
--- a/maxutils/maxsql/include/maxsql/queryresult.hh
+++ b/maxutils/maxsql/include/maxsql/queryresult.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxsql/src/mariadb.cc b/maxutils/maxsql/src/mariadb.cc
index ac3af2221..9e07f9830 100644
--- a/maxutils/maxsql/src/mariadb.cc
+++ b/maxutils/maxsql/src/mariadb.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/maxutils/maxsql/src/queryresult.cc b/maxutils/maxsql/src/queryresult.cc
index 0cde87c7a..210df0436 100644
--- a/maxutils/maxsql/src/queryresult.cc
+++ b/maxutils/maxsql/src/queryresult.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/script/check-maxscale-change-date b/script/check-maxscale-change-date
index 293b4beb3..ed068b656 100755
--- a/script/check-maxscale-change-date
+++ b/script/check-maxscale-change-date
@@ -5,7 +5,7 @@
 #  Use of this software is governed by the Business Source License included
 #  in the LICENSE.TXT file and at www.mariadb.com/bsl11.
 #
-#  Change Date: 2024-02-10
+#  Change Date: 2024-03-10
 #
 #  On the date above, in accordance with the Business Source License, use
 #  of this software will be governed by version 2 or later of the General
diff --git a/script/update-maxscale-change-date b/script/update-maxscale-change-date
index a75fd80e2..3c60a77ef 100755
--- a/script/update-maxscale-change-date
+++ b/script/update-maxscale-change-date
@@ -5,7 +5,7 @@
 #  Use of this software is governed by the Business Source License included
 #  in the LICENSE.TXT file and at www.mariadb.com/bsl11.
 #
-#  Change Date: 2024-02-10
+#  Change Date: 2024-03-10
 #
 #  On the date above, in accordance with the Business Source License, use
 #  of this software will be governed by version 2 or later of the General
diff --git a/server/core/config2.cc b/server/core/config2.cc
index 5f5317615..a3f98830a 100644
--- a/server/core/config2.cc
+++ b/server/core/config2.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/core/dcb.cc b/server/core/dcb.cc
index 00116a513..c3bf5b483 100644
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@@ -2653,6 +2653,12 @@ static uint32_t dcb_process_poll_events(DCB* dcb, uint32_t events)
     /**
      * Any of these callbacks might close the DCB. Hence, the value of 'n_close'
      * must be checked after each callback invocation.
+     *
+     * The order in which the events are processed is meaningful and should not be changed. EPOLLERR is
+     * handled first to get the best possible error message in the log message in case EPOLLERR is returned
+     * with another event from epoll_wait. EPOLLOUT and EPOLLIN are processed before EPOLLHUP and EPOLLRDHUP
+     * so that all client events are processed in case EPOLLIN and EPOLLRDHUP events arrive in the same
+     * epoll_wait.
      */
     if ((events & EPOLLERR) && (dcb->n_close == 0))
     {
@@ -2665,6 +2671,40 @@ static uint32_t dcb_process_poll_events(DCB* dcb, uint32_t events)
         }
     }
 
+    if ((events & EPOLLOUT) && (dcb->n_close == 0))
+    {
+        rc |= MXB_POLL_WRITE;
+
+        if (dcb_session_check(dcb, "write_ready"))
+        {
+            DCB_EH_NOTICE("Calling dcb->func.write_ready(%p)", dcb);
+            dcb->func.write_ready(dcb);
+        }
+    }
+
+    if ((events & EPOLLIN) && (dcb->n_close == 0))
+    {
+        rc |= MXB_POLL_READ;
+
+        if (dcb_session_check(dcb, "read"))
+        {
+            int return_code = 1;
+            /** SSL authentication is still going on, we need to call dcb_accept_SSL
+             * until it return 1 for success or -1 for error */
+            if (dcb->ssl_state == SSL_HANDSHAKE_REQUIRED)
+            {
+                return_code = (DCB::Role::CLIENT == dcb->role) ?
+                    dcb_accept_SSL(dcb) :
+                    dcb_connect_SSL(dcb);
+            }
+            if (1 == return_code)
+            {
+                DCB_EH_NOTICE("Calling dcb->func.read(%p)", dcb);
+                dcb->func.read(dcb);
+            }
+        }
+    }
+
     if ((events & EPOLLHUP) && (dcb->n_close == 0))
     {
         rc |= MXB_POLL_HUP;
@@ -2699,40 +2739,6 @@ static uint32_t dcb_process_poll_events(DCB* dcb, uint32_t events)
     }
 #endif
 
-    if ((events & EPOLLOUT) && (dcb->n_close == 0))
-    {
-        rc |= MXB_POLL_WRITE;
-
-        if (dcb_session_check(dcb, "write_ready"))
-        {
-            DCB_EH_NOTICE("Calling dcb->func.write_ready(%p)", dcb);
-            dcb->func.write_ready(dcb);
-        }
-    }
-
-    if ((events & EPOLLIN) && (dcb->n_close == 0))
-    {
-        rc |= MXB_POLL_READ;
-
-        if (dcb_session_check(dcb, "read"))
-        {
-            int return_code = 1;
-            /** SSL authentication is still going on, we need to call dcb_accept_SSL
-             * until it return 1 for success or -1 for error */
-            if (dcb->ssl_state == SSL_HANDSHAKE_REQUIRED)
-            {
-                return_code = (DCB::Role::CLIENT == dcb->role) ?
-                    dcb_accept_SSL(dcb) :
-                    dcb_connect_SSL(dcb);
-            }
-            if (1 == return_code)
-            {
-                DCB_EH_NOTICE("Calling dcb->func.read(%p)", dcb);
-                dcb->func.read(dcb);
-            }
-        }
-    }
-
     return rc;
 }
 
diff --git a/server/core/internal/externcmd.hh b/server/core/internal/externcmd.hh
index 49bce5381..a4687b7d0 100644
--- a/server/core/internal/externcmd.hh
+++ b/server/core/internal/externcmd.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/core/internal/monitormanager.hh b/server/core/internal/monitormanager.hh
index e3fc1532d..1b473be39 100644
--- a/server/core/internal/monitormanager.hh
+++ b/server/core/internal/monitormanager.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/core/mainworker.cc b/server/core/mainworker.cc
index ecbfdf212..658167458 100644
--- a/server/core/mainworker.cc
+++ b/server/core/mainworker.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/core/monitormanager.cc b/server/core/monitormanager.cc
index eaae6234a..0065eacca 100644
--- a/server/core/monitormanager.cc
+++ b/server/core/monitormanager.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/core/packet_tracker.cc b/server/core/packet_tracker.cc
index 84f841f11..be176298b 100644
--- a/server/core/packet_tracker.cc
+++ b/server/core/packet_tracker.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/core/test/rest-api/package-lock.json b/server/core/test/rest-api/package-lock.json
index 6425db762..25d91fc18 100644
--- a/server/core/test/rest-api/package-lock.json
+++ b/server/core/test/rest-api/package-lock.json
@@ -4,6 +4,16 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@types/geojson": {
+      "version": "7946.0.7",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz",
+      "integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ=="
+    },
+    "@types/node": {
+      "version": "13.9.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz",
+      "integrity": "sha512-E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ=="
+    },
     "ajv": {
       "version": "5.5.2",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
@@ -167,6 +177,11 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
+    "denque": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz",
+      "integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ=="
+    },
     "diff": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
@@ -309,6 +324,14 @@
         "sshpk": "^1.7.0"
       }
     },
+    "iconv-lite": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.1.tgz",
+      "integrity": "sha512-ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -369,6 +392,24 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
       "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw=="
     },
+    "long": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
+      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+    },
+    "mariadb": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-2.2.0.tgz",
+      "integrity": "sha512-YXPF11u4NVgm3FLetJoAbq9Fb0a/RSwNrDHdmAqpqgYErWAOes/IVbOfvWPWZQ0hI88j/81f15AGJZAVuR3bGg==",
+      "requires": {
+        "@types/geojson": "^7946.0.7",
+        "@types/node": ">=8.0.0",
+        "denque": "^1.4.1",
+        "iconv-lite": "^0.5.1",
+        "long": "^4.0.0",
+        "moment-timezone": "^0.5.27"
+      }
+    },
     "mime-db": {
       "version": "1.37.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
@@ -421,6 +462,19 @@
         "supports-color": "5.4.0"
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
+    "moment-timezone": {
+      "version": "0.5.28",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.28.tgz",
+      "integrity": "sha512-TDJkZvAyKIVWg5EtVqRzU97w0Rb0YVbfpqyjgu6GwXCAohVRqwZjf4fOzDE6p1Ch98Sro/8hQQi65WDXW5STPw==",
+      "requires": {
+        "moment": ">= 2.9.0"
+      }
+    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
diff --git a/server/core/test/test_config2.cc b/server/core/test/test_config2.cc
index 66554fbd9..940094f87 100644
--- a/server/core/test/test_config2.cc
+++ b/server/core/test/test_config2.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/core/test/test_housekeeper.cc b/server/core/test/test_housekeeper.cc
index 0c113806a..542a928c3 100644
--- a/server/core/test/test_housekeeper.cc
+++ b/server/core/test/test_housekeeper.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/core/test/test_utils.hh b/server/core/test/test_utils.hh
index f8045dd27..cd669453f 100644
--- a/server/core/test/test_utils.hh
+++ b/server/core/test/test_utils.hh
@@ -5,7 +5,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/filter/cache/cacheconfig.cc b/server/modules/filter/cache/cacheconfig.cc
index 52a7dcad8..36bb52359 100644
--- a/server/modules/filter/cache/cacheconfig.cc
+++ b/server/modules/filter/cache/cacheconfig.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/filter/cache/cacheconfig.hh b/server/modules/filter/cache/cacheconfig.hh
index 034a21c16..abc217f1e 100644
--- a/server/modules/filter/cache/cacheconfig.hh
+++ b/server/modules/filter/cache/cacheconfig.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/filter/cache/test/cache_bugs.cc b/server/modules/filter/cache/test/cache_bugs.cc
index 939a5c12b..94f539ef9 100644
--- a/server/modules/filter/cache/test/cache_bugs.cc
+++ b/server/modules/filter/cache/test/cache_bugs.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/filter/cache/test/cache_stress.cc b/server/modules/filter/cache/test/cache_stress.cc
index 927e97db9..b38d67653 100644
--- a/server/modules/filter/cache/test/cache_stress.cc
+++ b/server/modules/filter/cache/test/cache_stress.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/filter/hintfilter/mysqlhint.hh b/server/modules/filter/hintfilter/mysqlhint.hh
index eb3e60c93..7c46848ca 100644
--- a/server/modules/filter/hintfilter/mysqlhint.hh
+++ b/server/modules/filter/hintfilter/mysqlhint.hh
@@ -5,7 +5,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/filter/hintfilter/test/test_hintparser.cc b/server/modules/filter/hintfilter/test/test_hintparser.cc
index 0e0bcaacf..6975ec154 100644
--- a/server/modules/filter/hintfilter/test/test_hintparser.cc
+++ b/server/modules/filter/hintfilter/test/test_hintparser.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/filter/qlafilter/qlafilter.hh b/server/modules/filter/qlafilter/qlafilter.hh
index a2b260e91..a223d4299 100644
--- a/server/modules/filter/qlafilter/qlafilter.hh
+++ b/server/modules/filter/qlafilter/qlafilter.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/monitor/clustrixmon/clustrix.cc b/server/modules/monitor/clustrixmon/clustrix.cc
index 7c67d5da3..3ba2ce82e 100644
--- a/server/modules/monitor/clustrixmon/clustrix.cc
+++ b/server/modules/monitor/clustrixmon/clustrix.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/monitor/clustrixmon/clustrix.hh b/server/modules/monitor/clustrixmon/clustrix.hh
index 939d31c3b..ec733308b 100644
--- a/server/modules/monitor/clustrixmon/clustrix.hh
+++ b/server/modules/monitor/clustrixmon/clustrix.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/monitor/clustrixmon/clustrixmembership.hh b/server/modules/monitor/clustrixmon/clustrixmembership.hh
index 727e5903d..d014cd4c9 100644
--- a/server/modules/monitor/clustrixmon/clustrixmembership.hh
+++ b/server/modules/monitor/clustrixmon/clustrixmembership.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/monitor/clustrixmon/clustrixmon.cc b/server/modules/monitor/clustrixmon/clustrixmon.cc
index 0d5b84a54..844c47835 100644
--- a/server/modules/monitor/clustrixmon/clustrixmon.cc
+++ b/server/modules/monitor/clustrixmon/clustrixmon.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/monitor/clustrixmon/clustrixmonitor.cc b/server/modules/monitor/clustrixmon/clustrixmonitor.cc
index a6ebf88f4..56f06f054 100644
--- a/server/modules/monitor/clustrixmon/clustrixmonitor.cc
+++ b/server/modules/monitor/clustrixmon/clustrixmonitor.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/monitor/clustrixmon/clustrixmonitor.hh b/server/modules/monitor/clustrixmon/clustrixmonitor.hh
index 9779e26c6..cbabea541 100644
--- a/server/modules/monitor/clustrixmon/clustrixmonitor.hh
+++ b/server/modules/monitor/clustrixmon/clustrixmonitor.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/monitor/clustrixmon/clustrixnode.cc b/server/modules/monitor/clustrixmon/clustrixnode.cc
index fa665f53e..6a5696622 100644
--- a/server/modules/monitor/clustrixmon/clustrixnode.cc
+++ b/server/modules/monitor/clustrixmon/clustrixnode.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/monitor/clustrixmon/clustrixnode.hh b/server/modules/monitor/clustrixmon/clustrixnode.hh
index 88087b00d..fc075032c 100644
--- a/server/modules/monitor/clustrixmon/clustrixnode.hh
+++ b/server/modules/monitor/clustrixmon/clustrixnode.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/routing/avrorouter/config.hh b/server/modules/routing/avrorouter/config.hh
index 843f6e0bb..e3748b7c7 100644
--- a/server/modules/routing/avrorouter/config.hh
+++ b/server/modules/routing/avrorouter/config.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/routing/avrorouter/replicator.cc b/server/modules/routing/avrorouter/replicator.cc
index 88d11082f..b6dc9921f 100644
--- a/server/modules/routing/avrorouter/replicator.cc
+++ b/server/modules/routing/avrorouter/replicator.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/routing/avrorouter/replicator.hh b/server/modules/routing/avrorouter/replicator.hh
index b2230aea7..b1323ad60 100644
--- a/server/modules/routing/avrorouter/replicator.hh
+++ b/server/modules/routing/avrorouter/replicator.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/routing/avrorouter/sql.cc b/server/modules/routing/avrorouter/sql.cc
index 849a3a712..53d8808b4 100644
--- a/server/modules/routing/avrorouter/sql.cc
+++ b/server/modules/routing/avrorouter/sql.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/routing/avrorouter/sql.hh b/server/modules/routing/avrorouter/sql.hh
index 2b2613d33..5315ac816 100644
--- a/server/modules/routing/avrorouter/sql.hh
+++ b/server/modules/routing/avrorouter/sql.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/routing/readconnroute/readconnroute.hh b/server/modules/routing/readconnroute/readconnroute.hh
index cabc74442..80cfc8f8f 100644
--- a/server/modules/routing/readconnroute/readconnroute.hh
+++ b/server/modules/routing/readconnroute/readconnroute.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/routing/readwritesplit/readwritesplit.cc b/server/modules/routing/readwritesplit/readwritesplit.cc
index e4cc362aa..6811c13ca 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.cc
+++ b/server/modules/routing/readwritesplit/readwritesplit.cc
@@ -502,12 +502,7 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
                 MXS_MODULE_OPT_NONE,
                 master_failure_mode_values
             },
-            {
-                "max_slave_replication_lag",
-                MXS_MODULE_PARAM_DURATION,
-                DEFAULT_MAX_SLAVE_REPLICATION_LAG_STR,
-                MXS_MODULE_OPT_DURATION_S
-            },
+            {"max_slave_replication_lag",  MXS_MODULE_PARAM_DURATION,  "0s",   MXS_MODULE_OPT_DURATION_S},
             {"max_slave_connections",      MXS_MODULE_PARAM_STRING,    MAX_SLAVE_COUNT},
             {"retry_failed_reads",         MXS_MODULE_PARAM_BOOL,      "true"},
             {"prune_sescmd_history",       MXS_MODULE_PARAM_BOOL,      "false"},
diff --git a/server/modules/routing/readwritesplit/readwritesplit.hh b/server/modules/routing/readwritesplit/readwritesplit.hh
index 4c23566a6..cde124550 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.hh
+++ b/server/modules/routing/readwritesplit/readwritesplit.hh
@@ -124,9 +124,6 @@ static const char gtid_wait_stmt[] =
     "SET @maxscale_secret_variable=(SELECT CASE WHEN %s('%s', %s) = 0 "
     "THEN 1 ELSE (SELECT 1 FROM INFORMATION_SCHEMA.ENGINES) END);";
 
-static const char DEFAULT_MAX_SLAVE_REPLICATION_LAG_STR[] = "2147483647s";
-static const int DEFAULT_MAX_SLAVE_REPLICATION_LAG = 2147483647;
-
 /** Function that returns a "score" for a server to enable comparison.
  *  Smaller numbers are better.
  */
diff --git a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
index f39633cd4..3691c2396 100644
--- a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
@@ -735,7 +735,7 @@ int RWSplitSession::get_max_replication_lag()
     int conf_max_rlag = SERVER::RLAG_UNDEFINED;
 
     /** if there is no configured value, then longest possible int is used */
-    if (m_config.max_slave_replication_lag != DEFAULT_MAX_SLAVE_REPLICATION_LAG)
+    if (m_config.max_slave_replication_lag > 0)
     {
         conf_max_rlag = m_config.max_slave_replication_lag;
     }
diff --git a/server/modules/routing/smartrouter/performance.cc b/server/modules/routing/smartrouter/performance.cc
index 00338b1a0..4f68ddaf2 100644
--- a/server/modules/routing/smartrouter/performance.cc
+++ b/server/modules/routing/smartrouter/performance.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/routing/smartrouter/performance.hh b/server/modules/routing/smartrouter/performance.hh
index 65a425848..d9729d8a3 100644
--- a/server/modules/routing/smartrouter/performance.hh
+++ b/server/modules/routing/smartrouter/performance.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/routing/smartrouter/smartrouter.cc b/server/modules/routing/smartrouter/smartrouter.cc
index 1f223e191..145b99083 100644
--- a/server/modules/routing/smartrouter/smartrouter.cc
+++ b/server/modules/routing/smartrouter/smartrouter.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/routing/smartrouter/smartrouter.hh b/server/modules/routing/smartrouter/smartrouter.hh
index bf2e05c65..0f54ba4bd 100644
--- a/server/modules/routing/smartrouter/smartrouter.hh
+++ b/server/modules/routing/smartrouter/smartrouter.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/routing/smartrouter/smartsession.cc b/server/modules/routing/smartrouter/smartsession.cc
index b8945f647..3a8b97dfa 100644
--- a/server/modules/routing/smartrouter/smartsession.cc
+++ b/server/modules/routing/smartrouter/smartsession.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General
diff --git a/server/modules/routing/smartrouter/smartsession.hh b/server/modules/routing/smartrouter/smartsession.hh
index 92c85e59c..04cba4f1f 100644
--- a/server/modules/routing/smartrouter/smartsession.hh
+++ b/server/modules/routing/smartrouter/smartsession.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2024-02-10
+ * Change Date: 2024-03-10
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General