diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index 32107dc6..b3b918f7 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -2988,7 +2988,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3038,7 +3038,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3046,7 +3046,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "serde",
  "tracing",
@@ -3058,12 +3058,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "flume 0.11.0",
  "json5",
@@ -3083,7 +3083,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -3095,7 +3095,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "aes",
  "hmac",
@@ -3108,7 +3108,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "bincode",
  "flume 0.11.0",
@@ -3129,7 +3129,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -3143,7 +3143,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -3161,7 +3161,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3185,7 +3185,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "async-trait",
  "base64",
@@ -3214,7 +3214,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "async-trait",
  "tokio",
@@ -3232,7 +3232,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "async-trait",
  "base64",
@@ -3260,7 +3260,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "async-trait",
  "socket2 0.5.6",
@@ -3281,7 +3281,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "async-trait",
  "futures",
@@ -3301,7 +3301,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3322,7 +3322,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3333,7 +3333,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "const_format",
  "libloading",
@@ -3349,7 +3349,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "const_format",
  "rand",
@@ -3363,7 +3363,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "anyhow",
 ]
@@ -3371,7 +3371,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "futures",
  "lazy_static",
@@ -3387,7 +3387,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "event-listener 4.0.0",
  "futures",
@@ -3401,7 +3401,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "futures",
  "tokio",
@@ -3414,7 +3414,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3446,7 +3446,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#2d88c7bdcc46c58a7fbdb67397841452ac8f60ec"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f47354cf0ab8f76e8a7079553873e716e7d880b8"
 dependencies = [
  "async-std",
  "async-trait",