diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea4dca822..8f9d05798 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # CMakeList.txt
 #
-# Copyright (C) 2006-2022 wolfSSL Inc.
+# Copyright (C) 2006-2023 wolfSSL Inc.
 #
 # This file is part of wolfSSL. (formerly known as CyaSSL)
 #
@@ -21,7 +21,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(wolfMQTT VERSION 1.15.0 LANGUAGES C)
+project(wolfMQTT VERSION 1.15.1 LANGUAGES C)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 set(MQTT_SOURCES
diff --git a/ChangeLog.md b/ChangeLog.md
index 0b41dcf72..8869cd268 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,9 @@
 ## Release Notes
 
+### v1.15.1 (3/14/2023)
+* Fix to protect read from client->write.len, which resolve edge case issue
+  when using multi-threading. (PR #318 and PR #319)
+
 ### v1.15.0 (12/30/2022)
 * Fix for --with-libwolfssl-prefix config option #312
 * Call disconn CB with MQTTv5 reason code #314
diff --git a/IDE/F767ZI-TOPPERS/user_settings.h b/IDE/F767ZI-TOPPERS/user_settings.h
index b811f7f09..8052d9ee7 100644
--- a/IDE/F767ZI-TOPPERS/user_settings.h
+++ b/IDE/F767ZI-TOPPERS/user_settings.h
@@ -1,6 +1,6 @@
 /* user_settings.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/configure.ac b/configure.ac
index e3e1fbeb6..274f802e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 # wolfmqtt
-# Copyright (C) 2022 wolfSSL Inc.
+# Copyright (C) 2023 wolfSSL Inc.
 # All right reserved.
 
-AC_COPYRIGHT([Copyright (C) 2014-2022 wolfSSL Inc.])
-AC_INIT([wolfmqtt],[1.15.0],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
+AC_COPYRIGHT([Copyright (C) 2014-2023 wolfSSL Inc.])
+AC_INIT([wolfmqtt],[1.15.1],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
 
 AC_PREREQ([2.63])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -23,7 +23,7 @@ AC_ARG_PROGRAM
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([src/config.h])
 
-WOLFMQTT_LIBRARY_VERSION=14:0:0
+WOLFMQTT_LIBRARY_VERSION=14:1:0
 #                        | | |
 #                 +------+ | +---+
 #                 |        |     |
diff --git a/examples/aws/awsiot.c b/examples/aws/awsiot.c
index 1d52d8347..55f28faca 100644
--- a/examples/aws/awsiot.c
+++ b/examples/aws/awsiot.c
@@ -1,6 +1,6 @@
 /* awsiot.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/aws/awsiot.h b/examples/aws/awsiot.h
index ed18fc06f..090e8aade 100644
--- a/examples/aws/awsiot.h
+++ b/examples/aws/awsiot.h
@@ -1,6 +1,6 @@
 /* awsiot.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/azure/azureiothub.c b/examples/azure/azureiothub.c
index d4083ba91..cbcb4d9bf 100644
--- a/examples/azure/azureiothub.c
+++ b/examples/azure/azureiothub.c
@@ -1,6 +1,6 @@
 /* azureiothub.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/azure/azureiothub.h b/examples/azure/azureiothub.h
index 813c8823d..ef341a4e9 100644
--- a/examples/azure/azureiothub.h
+++ b/examples/azure/azureiothub.h
@@ -1,6 +1,6 @@
 /* azureiothub.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/firmware/fwclient.c b/examples/firmware/fwclient.c
index b24504799..0d41af85e 100644
--- a/examples/firmware/fwclient.c
+++ b/examples/firmware/fwclient.c
@@ -1,6 +1,6 @@
 /* fwclient.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/firmware/fwclient.h b/examples/firmware/fwclient.h
index cd7b28ca5..ad56ddf73 100644
--- a/examples/firmware/fwclient.h
+++ b/examples/firmware/fwclient.h
@@ -1,6 +1,6 @@
 /* fwclient.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/firmware/fwpush.c b/examples/firmware/fwpush.c
index 01ed46cf5..ae1672d6f 100644
--- a/examples/firmware/fwpush.c
+++ b/examples/firmware/fwpush.c
@@ -1,6 +1,6 @@
 /* fwpush.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/firmware/fwpush.h b/examples/firmware/fwpush.h
index e28537ad4..1f590a67c 100644
--- a/examples/firmware/fwpush.h
+++ b/examples/firmware/fwpush.h
@@ -1,6 +1,6 @@
 /* fwpush.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttclient/mqttclient.c b/examples/mqttclient/mqttclient.c
index 51e1e6a0b..8871be4fd 100644
--- a/examples/mqttclient/mqttclient.c
+++ b/examples/mqttclient/mqttclient.c
@@ -1,6 +1,6 @@
 /* mqttclient.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttclient/mqttclient.h b/examples/mqttclient/mqttclient.h
index 0b33f9fc1..25de259a0 100644
--- a/examples/mqttclient/mqttclient.h
+++ b/examples/mqttclient/mqttclient.h
@@ -1,6 +1,6 @@
 /* mqttclient.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttexample.c b/examples/mqttexample.c
index fa512dccf..2ede6b212 100644
--- a/examples/mqttexample.c
+++ b/examples/mqttexample.c
@@ -1,6 +1,6 @@
 /* mqttexample.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttexample.h b/examples/mqttexample.h
index ea6fc5ad7..49541fbb9 100644
--- a/examples/mqttexample.h
+++ b/examples/mqttexample.h
@@ -1,6 +1,6 @@
 /* mqttexample.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttnet.c b/examples/mqttnet.c
index 737cfb567..40f48ebfa 100644
--- a/examples/mqttnet.c
+++ b/examples/mqttnet.c
@@ -1,6 +1,6 @@
 /* mqttnet.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttnet.h b/examples/mqttnet.h
index 67686a93b..877c5e0ee 100644
--- a/examples/mqttnet.h
+++ b/examples/mqttnet.h
@@ -1,6 +1,6 @@
 /* mqttnet.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttsimple/mqttsimple.c b/examples/mqttsimple/mqttsimple.c
index bee722fb4..5fa115b53 100644
--- a/examples/mqttsimple/mqttsimple.c
+++ b/examples/mqttsimple/mqttsimple.c
@@ -1,6 +1,6 @@
 /* mqttsimple.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttsimple/mqttsimple.h b/examples/mqttsimple/mqttsimple.h
index 70eee1028..bcb7c1d1c 100644
--- a/examples/mqttsimple/mqttsimple.h
+++ b/examples/mqttsimple/mqttsimple.h
@@ -1,6 +1,6 @@
 /* mqttsimple
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/mqttuart.c b/examples/mqttuart.c
index c3af3f484..9be8e7e0b 100644
--- a/examples/mqttuart.c
+++ b/examples/mqttuart.c
@@ -1,6 +1,6 @@
 /* mqttuart.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/multithread/multithread.c b/examples/multithread/multithread.c
index c26270964..df1a4de76 100755
--- a/examples/multithread/multithread.c
+++ b/examples/multithread/multithread.c
@@ -1,6 +1,6 @@
 /* multithread.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/multithread/multithread.h b/examples/multithread/multithread.h
index d536ab92a..55613b38c 100644
--- a/examples/multithread/multithread.h
+++ b/examples/multithread/multithread.h
@@ -1,6 +1,6 @@
 /* multithread.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/nbclient/nbclient.c b/examples/nbclient/nbclient.c
index 2db167c7c..3ed19512f 100644
--- a/examples/nbclient/nbclient.c
+++ b/examples/nbclient/nbclient.c
@@ -1,6 +1,6 @@
 /* nbclient.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/nbclient/nbclient.h b/examples/nbclient/nbclient.h
index 129992501..5db4887ac 100644
--- a/examples/nbclient/nbclient.h
+++ b/examples/nbclient/nbclient.h
@@ -1,6 +1,6 @@
 /* nbclient.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/sn-client/sn-client.c b/examples/sn-client/sn-client.c
index 605257890..26dfc2696 100644
--- a/examples/sn-client/sn-client.c
+++ b/examples/sn-client/sn-client.c
@@ -1,6 +1,6 @@
 /* sn-client.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/sn-client/sn-client.h b/examples/sn-client/sn-client.h
index 6fbb3922c..341b84fdc 100644
--- a/examples/sn-client/sn-client.h
+++ b/examples/sn-client/sn-client.h
@@ -1,6 +1,6 @@
 /* sn-client.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/sn-client/sn-client_qos-1.c b/examples/sn-client/sn-client_qos-1.c
index 37dbc6cb9..d7957f45c 100644
--- a/examples/sn-client/sn-client_qos-1.c
+++ b/examples/sn-client/sn-client_qos-1.c
@@ -1,6 +1,6 @@
 /* sn-client_qos-1.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/sn-client/sn-multithread.c b/examples/sn-client/sn-multithread.c
index 1fcf6996d..53ea065d0 100644
--- a/examples/sn-client/sn-multithread.c
+++ b/examples/sn-client/sn-multithread.c
@@ -1,6 +1,6 @@
 /* sn-multithread.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/wiot/wiot.c b/examples/wiot/wiot.c
index 8d2b59004..64c250157 100644
--- a/examples/wiot/wiot.c
+++ b/examples/wiot/wiot.c
@@ -1,6 +1,6 @@
 /* wiot.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/examples/wiot/wiot.h b/examples/wiot/wiot.h
index 27aa12ed3..8c99211c2 100755
--- a/examples/wiot/wiot.h
+++ b/examples/wiot/wiot.h
@@ -1,6 +1,6 @@
 /* wiot.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/src/mqtt_client.c b/src/mqtt_client.c
index c550af8f8..6cc4cdcb4 100644
--- a/src/mqtt_client.c
+++ b/src/mqtt_client.c
@@ -1,6 +1,6 @@
 /* mqtt_client.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/src/mqtt_packet.c b/src/mqtt_packet.c
index ad08e8253..fac93f3f8 100755
--- a/src/mqtt_packet.c
+++ b/src/mqtt_packet.c
@@ -1,6 +1,6 @@
 /* mqtt_packet.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/src/mqtt_socket.c b/src/mqtt_socket.c
index 5a86ffddd..b142ec5d5 100644
--- a/src/mqtt_socket.c
+++ b/src/mqtt_socket.c
@@ -1,6 +1,6 @@
 /* mqtt_socket.c
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/wolfmqtt/mqtt_client.h b/wolfmqtt/mqtt_client.h
index 150682a44..ac795450c 100644
--- a/wolfmqtt/mqtt_client.h
+++ b/wolfmqtt/mqtt_client.h
@@ -1,6 +1,6 @@
 /* mqtt_client.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/wolfmqtt/mqtt_packet.h b/wolfmqtt/mqtt_packet.h
index ad0552c30..e6467b465 100644
--- a/wolfmqtt/mqtt_packet.h
+++ b/wolfmqtt/mqtt_packet.h
@@ -1,6 +1,6 @@
 /* mqtt_packet.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/wolfmqtt/mqtt_socket.h b/wolfmqtt/mqtt_socket.h
index 15fe08da7..31c8cf298 100644
--- a/wolfmqtt/mqtt_socket.h
+++ b/wolfmqtt/mqtt_socket.h
@@ -1,6 +1,6 @@
 /* mqtt_socket.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/wolfmqtt/mqtt_types.h b/wolfmqtt/mqtt_types.h
index f7e332809..d3ed26bc8 100644
--- a/wolfmqtt/mqtt_types.h
+++ b/wolfmqtt/mqtt_types.h
@@ -1,6 +1,6 @@
 /* mqtt_types.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/wolfmqtt/options.h.in b/wolfmqtt/options.h.in
index 107cde86c..cb8a47175 100644
--- a/wolfmqtt/options.h.in
+++ b/wolfmqtt/options.h.in
@@ -1,6 +1,6 @@
 /* options.h.in
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/wolfmqtt/version.h b/wolfmqtt/version.h
index 5b0f144f2..9f2749646 100644
--- a/wolfmqtt/version.h
+++ b/wolfmqtt/version.h
@@ -1,6 +1,6 @@
 /* version.h.in
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
@@ -34,8 +34,8 @@
 extern "C" {
 #endif
 
-#define LIBWOLFMQTT_VERSION_STRING "1.15.0"
-#define LIBWOLFMQTT_VERSION_HEX 0x01015000
+#define LIBWOLFMQTT_VERSION_STRING "1.15.1"
+#define LIBWOLFMQTT_VERSION_HEX 0x01015001
 
 #ifdef __cplusplus
 }
diff --git a/wolfmqtt/version.h.in b/wolfmqtt/version.h.in
index d20b92942..a45969d69 100644
--- a/wolfmqtt/version.h.in
+++ b/wolfmqtt/version.h.in
@@ -1,6 +1,6 @@
 /* version.h.in
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *
diff --git a/wolfmqtt/visibility.h b/wolfmqtt/visibility.h
index 6028239b5..85d6a368b 100644
--- a/wolfmqtt/visibility.h
+++ b/wolfmqtt/visibility.h
@@ -1,6 +1,6 @@
 /* visibility.h
  *
- * Copyright (C) 2006-2022 wolfSSL Inc.
+ * Copyright (C) 2006-2023 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *