diff --git a/Cargo.lock b/Cargo.lock
index 7f60c6b7..1cfa5151 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2160,9 +2160,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c"
+checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282"
 dependencies = [
  "web-time",
  "zeroize",
@@ -3718,7 +3718,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -3770,7 +3770,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3778,7 +3778,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3790,7 +3790,7 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "ahash",
 ]
@@ -3798,7 +3798,7 @@ dependencies = [
 [[package]]
 name = "zenoh-config"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "json5",
  "nonempty-collections",
@@ -3822,7 +3822,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3833,7 +3833,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "aes",
  "hmac",
@@ -3846,7 +3846,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3865,7 +3865,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "getrandom 0.2.16",
  "hashbrown 0.16.1",
@@ -3880,7 +3880,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3898,7 +3898,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "async-trait",
  "base64",
@@ -3931,7 +3931,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "async-trait",
  "base64",
@@ -3956,7 +3956,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic_datagram"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "async-trait",
  "quinn",
@@ -3976,7 +3976,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "async-trait",
  "socket2 0.5.10",
@@ -3993,7 +3993,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "async-trait",
  "base64",
@@ -4022,7 +4022,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "async-trait",
  "libc",
@@ -4043,7 +4043,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "async-trait",
  "nix",
@@ -4061,7 +4061,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4081,7 +4081,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4092,7 +4092,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "git-version",
  "libloading",
@@ -4109,7 +4109,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4133,7 +4133,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "anyhow",
 ]
@@ -4141,7 +4141,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4155,7 +4155,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -4184,7 +4184,7 @@ dependencies = [
 [[package]]
 name = "zenoh-stats"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "ahash",
  "prometheus-client",
@@ -4197,7 +4197,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "arc-swap",
  "event-listener",
@@ -4211,7 +4211,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "futures",
  "tokio",
@@ -4224,7 +4224,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4259,7 +4259,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.7.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c12329c308d0ca85975dfebfae7d0c23fb4c6ba7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#c7a40c50fb932395f98e468043cc71360695464f"
 dependencies = [
  "async-trait",
  "const_format",