diff --git a/Cargo.lock b/Cargo.lock
index a72cc1f8..f11771f1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5244,7 +5244,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -5314,7 +5314,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "zenoh-collections",
 ]
@@ -5322,7 +5322,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "tracing",
  "uhlc",
@@ -5333,7 +5333,7 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "ahash",
 ]
@@ -5341,7 +5341,7 @@ dependencies = [
 [[package]]
 name = "zenoh-config"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "json5",
  "nonempty-collections",
@@ -5365,7 +5365,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -5376,7 +5376,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "aes 0.8.4",
  "hmac 0.12.1",
@@ -5389,7 +5389,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "async-trait",
  "bincode",
@@ -5408,7 +5408,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "getrandom 0.2.17",
  "hashbrown 0.16.1",
@@ -5423,7 +5423,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -5441,7 +5441,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -5474,7 +5474,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -5499,7 +5499,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic_datagram"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "async-trait",
  "quinn",
@@ -5519,7 +5519,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "async-trait",
  "socket2 0.5.10",
@@ -5536,7 +5536,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -5565,7 +5565,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "async-trait",
  "libc",
@@ -5586,7 +5586,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "async-trait",
  "nix",
@@ -5604,7 +5604,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -5624,7 +5624,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5660,7 +5660,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-rest"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "anyhow",
  "async-std",
@@ -5685,7 +5685,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "git-version",
  "libloading",
@@ -5702,7 +5702,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -5710,13 +5710,14 @@ dependencies = [
  "uhlc",
  "zenoh-buffers",
  "zenoh-keyexpr",
+ "zenoh-macros",
  "zenoh-result",
 ]
 
 [[package]]
 name = "zenoh-result"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "anyhow",
 ]
@@ -5724,7 +5725,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "lazy_static",
  "ron",
@@ -5738,7 +5739,7 @@ dependencies = [
 [[package]]
 name = "zenoh-stats"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "ahash",
  "prometheus-client",
@@ -5751,7 +5752,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "arc-swap",
  "event-listener 5.4.1",
@@ -5765,7 +5766,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "futures",
  "tokio",
@@ -5778,7 +5779,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -5812,7 +5813,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.7.2"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6b684f163943f337fa87b22e8b98df1859fec8c7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#279e7684b6517b6871f350dcdaafd7a8475f6f14"
 dependencies = [
  "async-trait",
  "const_format",