diff --git a/Cargo.lock b/Cargo.lock
index 8f0b1b910..c3e234ae6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2953,7 +2953,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",
@@ -3003,7 +3003,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",
 ]
@@ -3035,7 +3035,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",
@@ -3048,12 +3048,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",
  "json5",
@@ -3072,7 +3072,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",
@@ -3084,7 +3084,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",
@@ -3097,7 +3097,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",
@@ -3110,6 +3110,7 @@ dependencies = [
  "zenoh-core",
  "zenoh-macros",
  "zenoh-result",
+ "zenoh-runtime",
  "zenoh-sync",
  "zenoh-util",
 ]
@@ -3117,7 +3118,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",
@@ -3131,7 +3132,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",
@@ -3149,7 +3150,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",
@@ -3172,7 +3173,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",
@@ -3200,7 +3201,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",
@@ -3218,7 +3219,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",
@@ -3246,7 +3247,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",
@@ -3267,7 +3268,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",
@@ -3287,7 +3288,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",
@@ -3308,7 +3309,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",
@@ -3319,7 +3320,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",
@@ -3335,7 +3336,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",
@@ -3349,7 +3350,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",
 ]
@@ -3357,7 +3358,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",
@@ -3368,7 +3369,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 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",
@@ -3380,7 +3381,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",
@@ -3394,7 +3395,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",
@@ -3426,7 +3427,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",