diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index b21b6591..38e27916 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -3073,7 +3073,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -3122,7 +3122,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3130,7 +3130,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3141,7 +3141,7 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "ahash",
 ]
@@ -3149,7 +3149,7 @@ dependencies = [
 [[package]]
 name = "zenoh-config"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "json5",
  "nonempty-collections",
@@ -3173,7 +3173,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3184,7 +3184,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "aes",
  "hmac",
@@ -3197,7 +3197,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3216,7 +3216,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "getrandom",
  "hashbrown 0.14.5",
@@ -3231,7 +3231,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3248,7 +3248,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3273,7 +3273,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3300,7 +3300,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3317,7 +3317,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3346,7 +3346,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "async-trait",
  "libc",
@@ -3367,7 +3367,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "async-trait",
  "nix",
@@ -3385,7 +3385,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3405,7 +3405,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3416,7 +3416,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "git-version",
  "libloading",
@@ -3432,7 +3432,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "const_format",
  "rand",
@@ -3446,7 +3446,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "anyhow",
 ]
@@ -3454,7 +3454,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3468,7 +3468,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "arc-swap",
  "event-listener",
@@ -3482,7 +3482,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "futures",
  "tokio",
@@ -3495,7 +3495,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3528,7 +3528,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.4.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#47fa6e556acc984fe037e5c89c7f50dfaea7b0f6"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#5d4beac71f7849ea800568e6761af33ba49675c6"
 dependencies = [
  "async-trait",
  "const_format",