diff --git a/builds/msvc/vs2010/inproc_lat/inproc_lat.props b/builds/msvc/vs2010/inproc_lat/inproc_lat.props
index 792a0ef1..fc03c8b4 100644
--- a/builds/msvc/vs2010/inproc_lat/inproc_lat.props
+++ b/builds/msvc/vs2010/inproc_lat/inproc_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2010/inproc_thr/inproc_thr.props b/builds/msvc/vs2010/inproc_thr/inproc_thr.props
index 99817a83..aba50589 100644
--- a/builds/msvc/vs2010/inproc_thr/inproc_thr.props
+++ b/builds/msvc/vs2010/inproc_thr/inproc_thr.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2010/libzmq/libzmq.props b/builds/msvc/vs2010/libzmq/libzmq.props
index d77bdff6..22da05ab 100644
--- a/builds/msvc/vs2010/libzmq/libzmq.props
+++ b/builds/msvc/vs2010/libzmq/libzmq.props
@@ -49,13 +49,13 @@
   </ImportGroup>
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2010/local_lat/local_lat.props b/builds/msvc/vs2010/local_lat/local_lat.props
index ae521521..ea5e3e56 100644
--- a/builds/msvc/vs2010/local_lat/local_lat.props
+++ b/builds/msvc/vs2010/local_lat/local_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2010/local_thr/local_thr.props b/builds/msvc/vs2010/local_thr/local_thr.props
index 0d6c8f0e..1d017d40 100644
--- a/builds/msvc/vs2010/local_thr/local_thr.props
+++ b/builds/msvc/vs2010/local_thr/local_thr.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2010/remote_lat/remote_lat.props b/builds/msvc/vs2010/remote_lat/remote_lat.props
index b03e266d..307eaf5e 100644
--- a/builds/msvc/vs2010/remote_lat/remote_lat.props
+++ b/builds/msvc/vs2010/remote_lat/remote_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2010/remote_thr/remote_thr.props b/builds/msvc/vs2010/remote_thr/remote_thr.props
index ba45c42a..001e4813 100644
--- a/builds/msvc/vs2010/remote_thr/remote_thr.props
+++ b/builds/msvc/vs2010/remote_thr/remote_thr.props
@@ -28,15 +28,15 @@
   
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2012/inproc_lat/inproc_lat.props b/builds/msvc/vs2012/inproc_lat/inproc_lat.props
index 792a0ef1..fc03c8b4 100644
--- a/builds/msvc/vs2012/inproc_lat/inproc_lat.props
+++ b/builds/msvc/vs2012/inproc_lat/inproc_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2012/inproc_thr/inproc_thr.props b/builds/msvc/vs2012/inproc_thr/inproc_thr.props
index 99817a83..aba50589 100644
--- a/builds/msvc/vs2012/inproc_thr/inproc_thr.props
+++ b/builds/msvc/vs2012/inproc_thr/inproc_thr.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2012/libzmq/libzmq.props b/builds/msvc/vs2012/libzmq/libzmq.props
index d77bdff6..22da05ab 100644
--- a/builds/msvc/vs2012/libzmq/libzmq.props
+++ b/builds/msvc/vs2012/libzmq/libzmq.props
@@ -49,13 +49,13 @@
   </ImportGroup>
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2012/local_lat/local_lat.props b/builds/msvc/vs2012/local_lat/local_lat.props
index ae521521..ea5e3e56 100644
--- a/builds/msvc/vs2012/local_lat/local_lat.props
+++ b/builds/msvc/vs2012/local_lat/local_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2012/local_thr/local_thr.props b/builds/msvc/vs2012/local_thr/local_thr.props
index 0d6c8f0e..1d017d40 100644
--- a/builds/msvc/vs2012/local_thr/local_thr.props
+++ b/builds/msvc/vs2012/local_thr/local_thr.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2012/remote_lat/remote_lat.props b/builds/msvc/vs2012/remote_lat/remote_lat.props
index b03e266d..307eaf5e 100644
--- a/builds/msvc/vs2012/remote_lat/remote_lat.props
+++ b/builds/msvc/vs2012/remote_lat/remote_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2012/remote_thr/remote_thr.props b/builds/msvc/vs2012/remote_thr/remote_thr.props
index ba45c42a..001e4813 100644
--- a/builds/msvc/vs2012/remote_thr/remote_thr.props
+++ b/builds/msvc/vs2012/remote_thr/remote_thr.props
@@ -28,15 +28,15 @@
   
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2013/inproc_lat/inproc_lat.props b/builds/msvc/vs2013/inproc_lat/inproc_lat.props
index 792a0ef1..fc03c8b4 100644
--- a/builds/msvc/vs2013/inproc_lat/inproc_lat.props
+++ b/builds/msvc/vs2013/inproc_lat/inproc_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2013/inproc_thr/inproc_thr.props b/builds/msvc/vs2013/inproc_thr/inproc_thr.props
index 99817a83..aba50589 100644
--- a/builds/msvc/vs2013/inproc_thr/inproc_thr.props
+++ b/builds/msvc/vs2013/inproc_thr/inproc_thr.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2013/libzmq/libzmq.props b/builds/msvc/vs2013/libzmq/libzmq.props
index d77bdff6..22da05ab 100644
--- a/builds/msvc/vs2013/libzmq/libzmq.props
+++ b/builds/msvc/vs2013/libzmq/libzmq.props
@@ -49,13 +49,13 @@
   </ImportGroup>
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2013/local_lat/local_lat.props b/builds/msvc/vs2013/local_lat/local_lat.props
index ae521521..ea5e3e56 100644
--- a/builds/msvc/vs2013/local_lat/local_lat.props
+++ b/builds/msvc/vs2013/local_lat/local_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2013/local_thr/local_thr.props b/builds/msvc/vs2013/local_thr/local_thr.props
index 0d6c8f0e..1d017d40 100644
--- a/builds/msvc/vs2013/local_thr/local_thr.props
+++ b/builds/msvc/vs2013/local_thr/local_thr.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2013/remote_lat/remote_lat.props b/builds/msvc/vs2013/remote_lat/remote_lat.props
index b03e266d..307eaf5e 100644
--- a/builds/msvc/vs2013/remote_lat/remote_lat.props
+++ b/builds/msvc/vs2013/remote_lat/remote_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2013/remote_thr/remote_thr.props b/builds/msvc/vs2013/remote_thr/remote_thr.props
index ba45c42a..001e4813 100644
--- a/builds/msvc/vs2013/remote_thr/remote_thr.props
+++ b/builds/msvc/vs2013/remote_thr/remote_thr.props
@@ -28,15 +28,15 @@
   
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2015/inproc_lat/inproc_lat.props b/builds/msvc/vs2015/inproc_lat/inproc_lat.props
index 792a0ef1..fc03c8b4 100644
--- a/builds/msvc/vs2015/inproc_lat/inproc_lat.props
+++ b/builds/msvc/vs2015/inproc_lat/inproc_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2015/inproc_thr/inproc_thr.props b/builds/msvc/vs2015/inproc_thr/inproc_thr.props
index 99817a83..aba50589 100644
--- a/builds/msvc/vs2015/inproc_thr/inproc_thr.props
+++ b/builds/msvc/vs2015/inproc_thr/inproc_thr.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2015/libzmq/libzmq.props b/builds/msvc/vs2015/libzmq/libzmq.props
index d77bdff6..22da05ab 100644
--- a/builds/msvc/vs2015/libzmq/libzmq.props
+++ b/builds/msvc/vs2015/libzmq/libzmq.props
@@ -49,13 +49,13 @@
   </ImportGroup>
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2015/local_lat/local_lat.props b/builds/msvc/vs2015/local_lat/local_lat.props
index ae521521..ea5e3e56 100644
--- a/builds/msvc/vs2015/local_lat/local_lat.props
+++ b/builds/msvc/vs2015/local_lat/local_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2015/local_thr/local_thr.props b/builds/msvc/vs2015/local_thr/local_thr.props
index 0d6c8f0e..1d017d40 100644
--- a/builds/msvc/vs2015/local_thr/local_thr.props
+++ b/builds/msvc/vs2015/local_thr/local_thr.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2015/remote_lat/remote_lat.props b/builds/msvc/vs2015/remote_lat/remote_lat.props
index b03e266d..307eaf5e 100644
--- a/builds/msvc/vs2015/remote_lat/remote_lat.props
+++ b/builds/msvc/vs2015/remote_lat/remote_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2015/remote_thr/remote_thr.props b/builds/msvc/vs2015/remote_thr/remote_thr.props
index ba45c42a..001e4813 100644
--- a/builds/msvc/vs2015/remote_thr/remote_thr.props
+++ b/builds/msvc/vs2015/remote_thr/remote_thr.props
@@ -28,15 +28,15 @@
   
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2017/inproc_lat/inproc_lat.props b/builds/msvc/vs2017/inproc_lat/inproc_lat.props
index 792a0ef1..fc03c8b4 100644
--- a/builds/msvc/vs2017/inproc_lat/inproc_lat.props
+++ b/builds/msvc/vs2017/inproc_lat/inproc_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2017/inproc_thr/inproc_thr.props b/builds/msvc/vs2017/inproc_thr/inproc_thr.props
index 99817a83..aba50589 100644
--- a/builds/msvc/vs2017/inproc_thr/inproc_thr.props
+++ b/builds/msvc/vs2017/inproc_thr/inproc_thr.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2017/libzmq/libzmq.props b/builds/msvc/vs2017/libzmq/libzmq.props
index d77bdff6..22da05ab 100644
--- a/builds/msvc/vs2017/libzmq/libzmq.props
+++ b/builds/msvc/vs2017/libzmq/libzmq.props
@@ -49,13 +49,13 @@
   </ImportGroup>
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2017/local_lat/local_lat.props b/builds/msvc/vs2017/local_lat/local_lat.props
index ae521521..ea5e3e56 100644
--- a/builds/msvc/vs2017/local_lat/local_lat.props
+++ b/builds/msvc/vs2017/local_lat/local_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2017/local_thr/local_thr.props b/builds/msvc/vs2017/local_thr/local_thr.props
index 0d6c8f0e..1d017d40 100644
--- a/builds/msvc/vs2017/local_thr/local_thr.props
+++ b/builds/msvc/vs2017/local_thr/local_thr.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2017/remote_lat/remote_lat.props b/builds/msvc/vs2017/remote_lat/remote_lat.props
index b03e266d..307eaf5e 100644
--- a/builds/msvc/vs2017/remote_lat/remote_lat.props
+++ b/builds/msvc/vs2017/remote_lat/remote_lat.props
@@ -28,15 +28,15 @@
 
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2017/remote_thr/remote_thr.props b/builds/msvc/vs2017/remote_thr/remote_thr.props
index ba45c42a..001e4813 100644
--- a/builds/msvc/vs2017/remote_thr/remote_thr.props
+++ b/builds/msvc/vs2017/remote_thr/remote_thr.props
@@ -28,15 +28,15 @@
   
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
     <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
+    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
     <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
+    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
   </PropertyGroup>
   <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
     <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
+    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
   </PropertyGroup>
 
   <!-- Messages -->