diff --git a/Cargo.lock b/Cargo.lock
index d2c0d21..d087b51 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3946,7 +3946,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3992,7 +3992,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "zenoh-collections",
 ]
@@ -4000,7 +4000,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "tracing",
  "uhlc",
@@ -4011,12 +4011,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "json5",
  "num_cpus",
@@ -4037,7 +4037,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -4048,7 +4048,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "aes 0.8.4",
  "hmac 0.12.1",
@@ -4061,7 +4061,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "hashbrown",
  "keyed-set",
@@ -4075,7 +4075,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -4092,7 +4092,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "async-trait",
  "flume",
@@ -4115,7 +4115,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4140,7 +4140,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4157,7 +4157,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4185,7 +4185,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4204,7 +4204,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "async-trait",
  "nix",
@@ -4222,7 +4222,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4242,7 +4242,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4253,7 +4253,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "git-version",
  "libloading",
@@ -4289,7 +4289,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4303,7 +4303,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "anyhow",
 ]
@@ -4311,7 +4311,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4324,7 +4324,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4337,7 +4337,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "futures",
  "tokio",
@@ -4350,7 +4350,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4383,7 +4383,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7159acf6e8759011d9b99e490e27cd0ecf0cf1c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3d86ed4efe9ec727722fc70eb2b17c8bc2bd95dd"
 dependencies = [
  "async-trait",
  "const_format",