diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index ccc1b3584..52c15ca96 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -57,9 +57,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "android-logd-logger"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d7b9303373a56714732e3371513edd14d12987d04ff4f48527444e804bc3ae"
+checksum = "09fe8042a3174caeafdad8ee1337788db51833e7f8649c07c6d6de70048adef4"
 dependencies = [
  "bytes",
  "env_logger 0.10.2",
@@ -67,7 +67,7 @@ dependencies = [
  "libc",
  "log",
  "parking_lot",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.4.1",
  "thiserror",
  "time",
  "winapi",
@@ -1688,6 +1688,15 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.3"
@@ -2994,7 +3003,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "async-trait",
  "base64",
@@ -3043,7 +3052,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3051,7 +3060,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "log",
  "serde",
@@ -3063,12 +3072,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "flume 0.11.0",
  "json5",
@@ -3087,7 +3096,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -3099,7 +3108,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "aes",
  "hmac",
@@ -3112,7 +3121,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "bincode",
  "env_logger 0.11.2",
@@ -3125,6 +3134,7 @@ dependencies = [
  "zenoh-core",
  "zenoh-macros",
  "zenoh-result",
+ "zenoh-runtime",
  "zenoh-sync",
  "zenoh-util",
 ]
@@ -3132,7 +3142,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -3146,7 +3156,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -3164,7 +3174,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3187,7 +3197,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "async-trait",
  "base64",
@@ -3215,7 +3225,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "async-trait",
  "log",
@@ -3233,7 +3243,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "async-trait",
  "base64",
@@ -3261,7 +3271,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "async-trait",
  "log",
@@ -3282,7 +3292,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "async-trait",
  "futures",
@@ -3302,7 +3312,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3323,7 +3333,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3334,7 +3344,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "const_format",
  "libloading",
@@ -3350,7 +3360,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "const_format",
  "rand",
@@ -3364,7 +3374,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "anyhow",
 ]
@@ -3372,7 +3382,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3383,7 +3393,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "event-listener 4.0.0",
  "futures",
@@ -3397,7 +3407,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3428,7 +3438,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#c15d9252d961ca0794e3cb52135c86b3f7984ac7"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=tokio-porting#91e0f9eca5c3b04925cb7f8dffb9a31827909569"
 dependencies = [
  "async-std",
  "async-trait",