diff --git a/core b/core
index c9f77677..884bfb65 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit c9f77677eccfc2ea3f00a091e1072a683c5a41d3
+Subproject commit 884bfb65ab1c776acb6dfad4b61207bab288f298
diff --git a/deploy/deploy-peer/src/main/resources/config/init/bftsmart/bftsmart.config b/deploy/deploy-peer/src/main/resources/config/init/bftsmart/bftsmart.config
index 0793149e..dd9c20c2 100644
--- a/deploy/deploy-peer/src/main/resources/config/init/bftsmart/bftsmart.config
+++ b/deploy/deploy-peer/src/main/resources/config/init/bftsmart/bftsmart.config
@@ -104,7 +104,7 @@ system.communication.send.retryCount=100
 system.communication.useSignatures = 0
 
 #Set to 1 if SMaRt should use MAC's, set to 0 if otherwise
-system.communication.useMACs = 1
+system.communication.useMACs = 0
 
 #Set to 1 if SMaRt should use the standard output to display debug messages, set to 0 if otherwise
 system.debug = 0
diff --git a/framework b/framework
index f9d50f43..a7d029fa 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit f9d50f43b6ae239d0d17ff50d9b19fd3b3283d3f
+Subproject commit a7d029faba042769dea0a07a1bdf8ca92466556a
diff --git a/test b/test
index 2dcb24d2..93691757 160000
--- a/test
+++ b/test
@@ -1 +1 @@
-Subproject commit 2dcb24d24d64c02ed681d5136750ab674be71b07
+Subproject commit 936917573e9205f80f1d9a2d401f370623656742