diff --git a/M2Mqtt/nanoFramework.M2Mqtt.nfproj b/M2Mqtt/nanoFramework.M2Mqtt.nfproj
index 1532043c..174d9816 100644
--- a/M2Mqtt/nanoFramework.M2Mqtt.nfproj
+++ b/M2Mqtt/nanoFramework.M2Mqtt.nfproj
@@ -91,8 +91,8 @@
     <Reference Include="nanoFramework.System.Collections, Version=1.5.56.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.System.Collections.1.5.56\lib\nanoFramework.System.Collections.dll</HintPath>
     </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.3.1\lib\nanoFramework.System.Text.dll</HintPath>
+    <Reference Include="nanoFramework.System.Text, Version=1.3.9.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\packages\nanoFramework.System.Text.1.3.9\lib\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Streams, Version=1.1.77.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.77\lib\System.IO.Streams.dll</HintPath>
diff --git a/M2Mqtt/packages.config b/M2Mqtt/packages.config
index b3d5ba40..0466f18b 100644
--- a/M2Mqtt/packages.config
+++ b/M2Mqtt/packages.config
@@ -6,7 +6,7 @@
   <package id="nanoFramework.System.Collections" version="1.5.56" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.IO.Streams" version="1.1.77" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Net" version="1.11.17" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.1" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Text" version="1.3.9" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Threading" version="1.1.45" targetFramework="netnano1.0" />
   <package id="Nerdbank.GitVersioning" version="3.7.115" developmentDependency="true" targetFramework="netnano1.0" />
 </packages>
\ No newline at end of file
diff --git a/M2Mqtt/packages.lock.json b/M2Mqtt/packages.lock.json
index bba96381..d8fb4832 100644
--- a/M2Mqtt/packages.lock.json
+++ b/M2Mqtt/packages.lock.json
@@ -40,9 +40,9 @@
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
-        "requested": "[1.3.1, 1.3.1]",
-        "resolved": "1.3.1",
-        "contentHash": "6BFCg7LUeN0Xx1R4QQF6HKDb3BnihtYY7X47IIkfFmsIurJbu643HyidhTxG/BwK4UYWRMC/Io4s/KdsLs6WlA=="
+        "requested": "[1.3.9, 1.3.9]",
+        "resolved": "1.3.9",
+        "contentHash": "IVQ+Hsu6KqFzvFC13cjAA4/J/1wi44Xa7GOu4R47v24HogsXKKus6Pn4icR2pffpLoythCVgX8L1qSiqTuPOEg=="
       },
       "nanoFramework.System.Threading": {
         "type": "Direct",
diff --git a/TestMqtt/Mosquito.TemperatureGauge/Mosquito.TemperatureGauge.nfproj b/TestMqtt/Mosquito.TemperatureGauge/Mosquito.TemperatureGauge.nfproj
index 8a9c4dc2..87eebfef 100644
--- a/TestMqtt/Mosquito.TemperatureGauge/Mosquito.TemperatureGauge.nfproj
+++ b/TestMqtt/Mosquito.TemperatureGauge/Mosquito.TemperatureGauge.nfproj
@@ -37,8 +37,8 @@
     <Reference Include="nanoFramework.Runtime.Native, Version=1.7.7.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.Runtime.Native.1.7.7\lib\nanoFramework.Runtime.Native.dll</HintPath>
     </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.System.Text.1.3.1\lib\nanoFramework.System.Text.dll</HintPath>
+    <Reference Include="nanoFramework.System.Text, Version=1.3.9.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\..\packages\nanoFramework.System.Text.1.3.9\lib\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Streams, Version=1.1.77.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.System.IO.Streams.1.1.77\lib\System.IO.Streams.dll</HintPath>
diff --git a/TestMqtt/Mosquito.TemperatureGauge/packages.config b/TestMqtt/Mosquito.TemperatureGauge/packages.config
index 18b09e00..9d0edbf9 100644
--- a/TestMqtt/Mosquito.TemperatureGauge/packages.config
+++ b/TestMqtt/Mosquito.TemperatureGauge/packages.config
@@ -5,6 +5,6 @@
   <package id="nanoFramework.Runtime.Native" version="1.7.7" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.IO.Streams" version="1.1.77" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Net" version="1.11.17" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.1" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Text" version="1.3.9" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Threading" version="1.1.45" targetFramework="netnano1.0" />
 </packages>
\ No newline at end of file
diff --git a/TestMqtt/Mosquito.TemperatureGauge/packages.lock.json b/TestMqtt/Mosquito.TemperatureGauge/packages.lock.json
index 3ab76c99..a81baa32 100644
--- a/TestMqtt/Mosquito.TemperatureGauge/packages.lock.json
+++ b/TestMqtt/Mosquito.TemperatureGauge/packages.lock.json
@@ -34,9 +34,9 @@
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
-        "requested": "[1.3.1, 1.3.1]",
-        "resolved": "1.3.1",
-        "contentHash": "6BFCg7LUeN0Xx1R4QQF6HKDb3BnihtYY7X47IIkfFmsIurJbu643HyidhTxG/BwK4UYWRMC/Io4s/KdsLs6WlA=="
+        "requested": "[1.3.9, 1.3.9]",
+        "resolved": "1.3.9",
+        "contentHash": "IVQ+Hsu6KqFzvFC13cjAA4/J/1wi44Xa7GOu4R47v24HogsXKKus6Pn4icR2pffpLoythCVgX8L1qSiqTuPOEg=="
       },
       "nanoFramework.System.Threading": {
         "type": "Direct",
diff --git a/TestMqtt/TestAppv5.0/TestAppv5.0.nfproj b/TestMqtt/TestAppv5.0/TestAppv5.0.nfproj
index d54f7dc2..366b1411 100644
--- a/TestMqtt/TestAppv5.0/TestAppv5.0.nfproj
+++ b/TestMqtt/TestAppv5.0/TestAppv5.0.nfproj
@@ -35,8 +35,8 @@
     <Reference Include="nanoFramework.Runtime.Events, Version=1.11.26.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.Runtime.Events.1.11.26\lib\nanoFramework.Runtime.Events.dll</HintPath>
     </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.System.Text.1.3.1\lib\nanoFramework.System.Text.dll</HintPath>
+    <Reference Include="nanoFramework.System.Text, Version=1.3.9.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\..\packages\nanoFramework.System.Text.1.3.9\lib\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="System.Device.Wifi, Version=1.5.107.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.System.Device.Wifi.1.5.107\lib\System.Device.Wifi.dll</HintPath>
diff --git a/TestMqtt/TestAppv5.0/packages.config b/TestMqtt/TestAppv5.0/packages.config
index 3e9640db..99bddab7 100644
--- a/TestMqtt/TestAppv5.0/packages.config
+++ b/TestMqtt/TestAppv5.0/packages.config
@@ -5,6 +5,6 @@
   <package id="nanoFramework.System.Device.Wifi" version="1.5.107" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.IO.Streams" version="1.1.77" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Net" version="1.11.17" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.1" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Text" version="1.3.9" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Threading" version="1.1.45" targetFramework="netnano1.0" />
 </packages>
\ No newline at end of file
diff --git a/TestMqtt/TestAppv5.0/packages.lock.json b/TestMqtt/TestAppv5.0/packages.lock.json
index aeb468e4..990f3835 100644
--- a/TestMqtt/TestAppv5.0/packages.lock.json
+++ b/TestMqtt/TestAppv5.0/packages.lock.json
@@ -34,9 +34,9 @@
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
-        "requested": "[1.3.1, 1.3.1]",
-        "resolved": "1.3.1",
-        "contentHash": "6BFCg7LUeN0Xx1R4QQF6HKDb3BnihtYY7X47IIkfFmsIurJbu643HyidhTxG/BwK4UYWRMC/Io4s/KdsLs6WlA=="
+        "requested": "[1.3.9, 1.3.9]",
+        "resolved": "1.3.9",
+        "contentHash": "IVQ+Hsu6KqFzvFC13cjAA4/J/1wi44Xa7GOu4R47v24HogsXKKus6Pn4icR2pffpLoythCVgX8L1qSiqTuPOEg=="
       },
       "nanoFramework.System.Threading": {
         "type": "Direct",
diff --git a/TestMqtt/TestMqtt-mosquittov3.1.1/TestMqtt-mosquittov3.1.1.nfproj b/TestMqtt/TestMqtt-mosquittov3.1.1/TestMqtt-mosquittov3.1.1.nfproj
index bff498d4..02cfd72e 100644
--- a/TestMqtt/TestMqtt-mosquittov3.1.1/TestMqtt-mosquittov3.1.1.nfproj
+++ b/TestMqtt/TestMqtt-mosquittov3.1.1/TestMqtt-mosquittov3.1.1.nfproj
@@ -30,8 +30,8 @@
     <Reference Include="nanoFramework.Runtime.Events, Version=1.11.26.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.Runtime.Events.1.11.26\lib\nanoFramework.Runtime.Events.dll</HintPath>
     </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.System.Text.1.3.1\lib\nanoFramework.System.Text.dll</HintPath>
+    <Reference Include="nanoFramework.System.Text, Version=1.3.9.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\..\packages\nanoFramework.System.Text.1.3.9\lib\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Streams, Version=1.1.77.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.System.IO.Streams.1.1.77\lib\System.IO.Streams.dll</HintPath>
diff --git a/TestMqtt/TestMqtt-mosquittov3.1.1/packages.config b/TestMqtt/TestMqtt-mosquittov3.1.1/packages.config
index 08957bc0..7bb1409c 100644
--- a/TestMqtt/TestMqtt-mosquittov3.1.1/packages.config
+++ b/TestMqtt/TestMqtt-mosquittov3.1.1/packages.config
@@ -4,6 +4,6 @@
   <package id="nanoFramework.Runtime.Events" version="1.11.26" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.IO.Streams" version="1.1.77" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Net" version="1.11.17" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.1" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Text" version="1.3.9" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Threading" version="1.1.45" targetFramework="netnano1.0" />
 </packages>
\ No newline at end of file
diff --git a/TestMqtt/TestMqtt-mosquittov3.1.1/packages.lock.json b/TestMqtt/TestMqtt-mosquittov3.1.1/packages.lock.json
index 5cbf6934..caf660f5 100644
--- a/TestMqtt/TestMqtt-mosquittov3.1.1/packages.lock.json
+++ b/TestMqtt/TestMqtt-mosquittov3.1.1/packages.lock.json
@@ -28,9 +28,9 @@
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
-        "requested": "[1.3.1, 1.3.1]",
-        "resolved": "1.3.1",
-        "contentHash": "6BFCg7LUeN0Xx1R4QQF6HKDb3BnihtYY7X47IIkfFmsIurJbu643HyidhTxG/BwK4UYWRMC/Io4s/KdsLs6WlA=="
+        "requested": "[1.3.9, 1.3.9]",
+        "resolved": "1.3.9",
+        "contentHash": "IVQ+Hsu6KqFzvFC13cjAA4/J/1wi44Xa7GOu4R47v24HogsXKKus6Pn4icR2pffpLoythCVgX8L1qSiqTuPOEg=="
       },
       "nanoFramework.System.Threading": {
         "type": "Direct",
diff --git a/Tests/MemoryLeakTestApp/MemoryLeakTestApp.nfproj b/Tests/MemoryLeakTestApp/MemoryLeakTestApp.nfproj
index e597290e..527ee92d 100644
--- a/Tests/MemoryLeakTestApp/MemoryLeakTestApp.nfproj
+++ b/Tests/MemoryLeakTestApp/MemoryLeakTestApp.nfproj
@@ -40,8 +40,8 @@
     <Reference Include="nanoFramework.Runtime.Native, Version=1.7.7.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.Runtime.Native.1.7.7\lib\nanoFramework.Runtime.Native.dll</HintPath>
     </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.System.Text.1.3.1\lib\nanoFramework.System.Text.dll</HintPath>
+    <Reference Include="nanoFramework.System.Text, Version=1.3.9.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\..\packages\nanoFramework.System.Text.1.3.9\lib\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="System.Device.Wifi, Version=1.5.107.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.System.Device.Wifi.1.5.107\lib\System.Device.Wifi.dll</HintPath>
diff --git a/Tests/MemoryLeakTestApp/packages.config b/Tests/MemoryLeakTestApp/packages.config
index ff94be2f..6077672c 100644
--- a/Tests/MemoryLeakTestApp/packages.config
+++ b/Tests/MemoryLeakTestApp/packages.config
@@ -6,6 +6,6 @@
   <package id="nanoFramework.System.Device.Wifi" version="1.5.107" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.IO.Streams" version="1.1.77" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Net" version="1.11.17" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.1" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Text" version="1.3.9" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Threading" version="1.1.45" targetFramework="netnano1.0" />
 </packages>
\ No newline at end of file
diff --git a/Tests/MemoryLeakTestApp/packages.lock.json b/Tests/MemoryLeakTestApp/packages.lock.json
index 16dd3bd8..c5689a9c 100644
--- a/Tests/MemoryLeakTestApp/packages.lock.json
+++ b/Tests/MemoryLeakTestApp/packages.lock.json
@@ -40,9 +40,9 @@
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
-        "requested": "[1.3.1, 1.3.1]",
-        "resolved": "1.3.1",
-        "contentHash": "6BFCg7LUeN0Xx1R4QQF6HKDb3BnihtYY7X47IIkfFmsIurJbu643HyidhTxG/BwK4UYWRMC/Io4s/KdsLs6WlA=="
+        "requested": "[1.3.9, 1.3.9]",
+        "resolved": "1.3.9",
+        "contentHash": "IVQ+Hsu6KqFzvFC13cjAA4/J/1wi44Xa7GOu4R47v24HogsXKKus6Pn4icR2pffpLoythCVgX8L1qSiqTuPOEg=="
       },
       "nanoFramework.System.Threading": {
         "type": "Direct",
diff --git a/Tests/MessageUnitTests/MessageUnitTests.nfproj b/Tests/MessageUnitTests/MessageUnitTests.nfproj
index 950027db..76b24010 100644
--- a/Tests/MessageUnitTests/MessageUnitTests.nfproj
+++ b/Tests/MessageUnitTests/MessageUnitTests.nfproj
@@ -59,8 +59,8 @@
     <Reference Include="mscorlib, Version=1.16.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.CoreLibrary.1.16.1\lib\mscorlib.dll</HintPath>
     </Reference>
-    <Reference Include="nanoFramework.System.Text, Version=1.3.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.System.Text.1.3.1\lib\nanoFramework.System.Text.dll</HintPath>
+    <Reference Include="nanoFramework.System.Text, Version=1.3.9.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
+      <HintPath>..\..\packages\nanoFramework.System.Text.1.3.9\lib\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.TestFramework, Version=3.0.57.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.TestFramework.3.0.57\lib\nanoFramework.TestFramework.dll</HintPath>
diff --git a/Tests/MessageUnitTests/packages.config b/Tests/MessageUnitTests/packages.config
index 02154c79..c0d6543d 100644
--- a/Tests/MessageUnitTests/packages.config
+++ b/Tests/MessageUnitTests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="nanoFramework.CoreLibrary" version="1.16.1" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="1.3.1" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Text" version="1.3.9" targetFramework="netnano1.0" />
   <package id="nanoFramework.TestFramework" version="3.0.57" targetFramework="netnano1.0" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/Tests/MessageUnitTests/packages.lock.json b/Tests/MessageUnitTests/packages.lock.json
index 7958cde5..168500f2 100644
--- a/Tests/MessageUnitTests/packages.lock.json
+++ b/Tests/MessageUnitTests/packages.lock.json
@@ -10,9 +10,9 @@
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
-        "requested": "[1.3.1, 1.3.1]",
-        "resolved": "1.3.1",
-        "contentHash": "6BFCg7LUeN0Xx1R4QQF6HKDb3BnihtYY7X47IIkfFmsIurJbu643HyidhTxG/BwK4UYWRMC/Io4s/KdsLs6WlA=="
+        "requested": "[1.3.9, 1.3.9]",
+        "resolved": "1.3.9",
+        "contentHash": "IVQ+Hsu6KqFzvFC13cjAA4/J/1wi44Xa7GOu4R47v24HogsXKKus6Pn4icR2pffpLoythCVgX8L1qSiqTuPOEg=="
       },
       "nanoFramework.TestFramework": {
         "type": "Direct",