diff --git a/Cargo.lock b/Cargo.lock
index d29080bad..2a48fbf5d 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=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "async-trait",
  "base64",
@@ -2996,6 +2996,7 @@ dependencies = [
  "zenoh-runtime",
  "zenoh-shm",
  "zenoh-sync",
+ "zenoh-task",
  "zenoh-transport",
  "zenoh-util",
 ]
@@ -3003,7 +3004,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3035,7 +3036,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "log",
  "serde",
@@ -3048,12 +3049,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "flume",
  "json5",
@@ -3073,7 +3074,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -3085,7 +3086,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "aes",
  "hmac",
@@ -3098,7 +3099,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "bincode",
  "env_logger 0.11.2",
@@ -3113,13 +3114,14 @@ dependencies = [
  "zenoh-result",
  "zenoh-runtime",
  "zenoh-sync",
+ "zenoh-task",
  "zenoh-util",
 ]
 
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -3133,7 +3135,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -3151,7 +3153,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "async-trait",
  "flume",
@@ -3174,7 +3176,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "async-trait",
  "base64",
@@ -3202,7 +3204,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "async-trait",
  "log",
@@ -3220,7 +3222,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "async-trait",
  "base64",
@@ -3248,7 +3250,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "async-trait",
  "log",
@@ -3269,7 +3271,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "async-trait",
  "futures",
@@ -3289,7 +3291,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3310,7 +3312,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3321,7 +3323,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "const_format",
  "libloading",
@@ -3337,7 +3339,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "const_format",
  "rand",
@@ -3351,7 +3353,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "anyhow",
 ]
@@ -3359,8 +3361,9 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
+ "futures",
  "lazy_static",
  "tokio",
  "zenoh-collections",
@@ -3370,7 +3373,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "log",
  "serde",
@@ -3382,7 +3385,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "event-listener 4.0.0",
  "futures",
@@ -3393,10 +3396,23 @@ dependencies = [
  "zenoh-runtime",
 ]
 
+[[package]]
+name = "zenoh-task"
+version = "0.11.0-dev"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
+dependencies = [
+ "futures",
+ "log",
+ "tokio",
+ "tokio-util",
+ "zenoh-core",
+ "zenoh-runtime",
+]
+
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "async-trait",
  "flume",
@@ -3422,13 +3438,14 @@ dependencies = [
  "zenoh-runtime",
  "zenoh-shm",
  "zenoh-sync",
+ "zenoh-task",
  "zenoh-util",
 ]
 
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#05b9cb459f77693bbf7c89d67265ba1519959814"
 dependencies = [
  "async-std",
  "async-trait",