diff --git a/Cargo.lock b/Cargo.lock
index 151dd0e07..afdeb3167 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3022,9 +3022,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "uhlc"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99b6df3f3e948b40e20c38a6d1fd6d8f91b3573922fc164e068ad3331560487e"
+checksum = "79ac3c37bd9506595768f0387bd39d644525728b4a1d783218acabfb56356db7"
 dependencies = [
  "humantime",
  "lazy_static",
@@ -3557,7 +3557,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3613,7 +3613,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3648,7 +3648,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "serde",
  "tracing",
@@ -3661,12 +3661,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "flume",
  "json5",
@@ -3688,7 +3688,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -3700,7 +3700,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "aes",
  "hmac",
@@ -3713,7 +3713,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "bincode",
  "flume",
@@ -3732,7 +3732,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -3746,7 +3746,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -3764,7 +3764,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "async-trait",
  "flume",
@@ -3788,7 +3788,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3819,9 +3819,10 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "async-trait",
+ "socket2 0.5.6",
  "tokio",
  "tokio-util",
  "tracing",
@@ -3837,7 +3838,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3847,6 +3848,7 @@ dependencies = [
  "rustls-pki-types",
  "rustls-webpki",
  "secrecy",
+ "socket2 0.5.6",
  "tokio",
  "tokio-rustls",
  "tokio-util",
@@ -3867,7 +3869,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "async-trait",
  "socket2 0.5.6",
@@ -3888,7 +3890,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "async-trait",
  "futures",
@@ -3908,7 +3910,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3929,7 +3931,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3940,7 +3942,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "libloading",
  "serde",
@@ -3955,7 +3957,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "const_format",
  "rand",
@@ -3970,7 +3972,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "anyhow",
 ]
@@ -3978,7 +3980,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "futures",
  "lazy_static",
@@ -3993,7 +3995,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "async-trait",
  "bincode",
@@ -4017,7 +4019,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4031,7 +4033,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "futures",
  "tokio",
@@ -4044,7 +4046,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "async-trait",
  "flume",
@@ -4077,7 +4079,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#bef94d19a901f0f85c42947058271a6a59858582"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=dev/1.0.0#cae8697e7da3f5d3ec75d0dd92d6180196b00efc"
 dependencies = [
  "async-std",
  "async-trait",