diff --git a/Cargo.lock b/Cargo.lock
index 8753c2045..9eedc9db8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3740,7 +3740,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3790,7 +3790,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3828,7 +3828,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3840,12 +3840,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "json5",
  "num_cpus",
@@ -3866,7 +3866,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3877,7 +3877,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "aes",
  "hmac",
@@ -3890,7 +3890,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "bincode",
  "flume",
@@ -3907,7 +3907,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -3921,7 +3921,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3941,7 +3941,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "flume",
@@ -3964,7 +3964,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3989,7 +3989,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-serial"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "tokio",
@@ -4007,7 +4007,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4024,7 +4024,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4051,7 +4051,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4070,7 +4070,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixpipe"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -4092,7 +4092,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "nix 0.29.0",
@@ -4110,7 +4110,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-vsock"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "libc",
@@ -4128,7 +4128,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4148,7 +4148,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4159,7 +4159,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "git-version",
  "libloading",
@@ -4175,7 +4175,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "const_format",
  "rand",
@@ -4189,7 +4189,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "anyhow",
 ]
@@ -4197,7 +4197,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4210,7 +4210,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -4233,7 +4233,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4246,7 +4246,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "futures",
  "tokio",
@@ -4259,7 +4259,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4293,7 +4293,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "const_format",
diff --git a/build-resources/opaque-types/Cargo.lock b/build-resources/opaque-types/Cargo.lock
index d51bb0311..4d077ac2a 100644
--- a/build-resources/opaque-types/Cargo.lock
+++ b/build-resources/opaque-types/Cargo.lock
@@ -3132,7 +3132,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3182,7 +3182,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3190,7 +3190,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3202,12 +3202,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "json5",
  "num_cpus",
@@ -3228,7 +3228,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3239,7 +3239,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "aes",
  "hmac",
@@ -3252,7 +3252,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "bincode",
  "flume",
@@ -3269,7 +3269,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "hashbrown",
  "keyed-set",
@@ -3283,7 +3283,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3303,7 +3303,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "flume",
@@ -3326,7 +3326,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3351,7 +3351,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-serial"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "tokio",
@@ -3369,7 +3369,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3386,7 +3386,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3413,7 +3413,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3432,7 +3432,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixpipe"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -3454,7 +3454,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "nix 0.29.0",
@@ -3472,7 +3472,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-vsock"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "libc",
@@ -3490,7 +3490,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3510,7 +3510,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3521,7 +3521,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "git-version",
  "libloading",
@@ -3537,7 +3537,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "const_format",
  "rand",
@@ -3551,7 +3551,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "anyhow",
 ]
@@ -3559,7 +3559,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3572,7 +3572,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -3595,7 +3595,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "event-listener",
  "futures",
@@ -3608,7 +3608,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "futures",
  "tokio",
@@ -3621,7 +3621,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3655,7 +3655,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#7e32e7295f85f5fd196d94afff26cc48584c938c"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e9f3b376315d680e8b172b5de65a051e702b9699"
 dependencies = [
  "async-trait",
  "const_format",
diff --git a/build-resources/opaque-types/src/lib.rs b/build-resources/opaque-types/src/lib.rs
index beebcc5c9..8b639c400 100644
--- a/build-resources/opaque-types/src/lib.rs
+++ b/build-resources/opaque-types/src/lib.rs
@@ -11,7 +11,7 @@ use std::{
 use zenoh::{
     bytes::{Encoding, ZBytes, ZBytesReader, ZBytesSliceIterator, ZBytesWriter},
     config::Config,
-    handlers::RingChannelHandler,
+    handlers::{FifoChannelHandler, RingChannelHandler},
     key_expr::KeyExpr,
     pubsub::{Publisher, Subscriber},
     query::{Query, Queryable, Reply, ReplyError},
@@ -432,11 +432,11 @@ get_opaque_type_data!(CSHMLayout, z_loaned_alloc_layout_t);
 
 /// An owned Zenoh fifo sample handler.
 get_opaque_type_data!(
-    Option<flume::Receiver<Sample>>,
+    Option<FifoChannelHandler<Sample>>,
     z_owned_fifo_handler_sample_t
 );
 /// An loaned Zenoh fifo sample handler.
-get_opaque_type_data!(flume::Receiver<Sample>, z_loaned_fifo_handler_sample_t);
+get_opaque_type_data!(FifoChannelHandler<Sample>, z_loaned_fifo_handler_sample_t);
 
 /// An owned Zenoh ring sample handler.
 get_opaque_type_data!(
@@ -447,9 +447,12 @@ get_opaque_type_data!(
 get_opaque_type_data!(RingChannelHandler<Sample>, z_loaned_ring_handler_sample_t);
 
 /// An owned Zenoh fifo query handler.
-get_opaque_type_data!(Option<flume::Receiver<Query>>, z_owned_fifo_handler_query_t);
+get_opaque_type_data!(
+    Option<FifoChannelHandler<Query>>,
+    z_owned_fifo_handler_query_t
+);
 /// An loaned Zenoh fifo query handler.
-get_opaque_type_data!(flume::Receiver<Query>, z_loaned_fifo_handler_query_t);
+get_opaque_type_data!(FifoChannelHandler<Query>, z_loaned_fifo_handler_query_t);
 
 /// An owned Zenoh ring query handler.
 get_opaque_type_data!(
@@ -460,9 +463,12 @@ get_opaque_type_data!(
 get_opaque_type_data!(RingChannelHandler<Query>, z_loaned_ring_handler_query_t);
 
 /// An owned Zenoh fifo reply handler.
-get_opaque_type_data!(Option<flume::Receiver<Reply>>, z_owned_fifo_handler_reply_t);
+get_opaque_type_data!(
+    Option<FifoChannelHandler<Reply>>,
+    z_owned_fifo_handler_reply_t
+);
 /// An loaned Zenoh fifo reply handler.
-get_opaque_type_data!(flume::Receiver<Reply>, z_loaned_fifo_handler_reply_t);
+get_opaque_type_data!(FifoChannelHandler<Reply>, z_loaned_fifo_handler_reply_t);
 
 /// An owned Zenoh ring reply handler.
 get_opaque_type_data!(
diff --git a/src/closures/query_channel.rs b/src/closures/query_channel.rs
index d9de76f88..c5c1263fc 100644
--- a/src/closures/query_channel.rs
+++ b/src/closures/query_channel.rs
@@ -16,7 +16,7 @@ use std::{mem::MaybeUninit, sync::Arc};
 
 use libc::c_void;
 use zenoh::{
-    handlers::{self, IntoHandler, RingChannelHandler},
+    handlers::{self, FifoChannelHandler, IntoHandler, RingChannelHandler},
     query::Query,
 };
 
@@ -29,7 +29,7 @@ use crate::{
     z_loaned_query_t, z_owned_closure_query_t, z_owned_query_t,
 };
 decl_c_type!(
-    owned(z_owned_fifo_handler_query_t, option flume::Receiver<Query> ),
+    owned(z_owned_fifo_handler_query_t, option FifoChannelHandler<Query> ),
     loaned(z_loaned_fifo_handler_query_t),
 );
 
@@ -133,16 +133,17 @@ pub extern "C" fn z_fifo_handler_query_try_recv(
     query: &mut MaybeUninit<z_owned_query_t>,
 ) -> z_result_t {
     match this.as_rust_type_ref().try_recv() {
-        Ok(q) => {
+        Ok(Some(q)) => {
             query.as_rust_type_mut_uninit().write(Some(q));
             result::Z_OK
         }
-        Err(e) => {
+        Ok(None) => {
             query.as_rust_type_mut_uninit().write(None);
-            match e {
-                flume::TryRecvError::Empty => result::Z_CHANNEL_NODATA,
-                flume::TryRecvError::Disconnected => result::Z_CHANNEL_DISCONNECTED,
-            }
+            result::Z_CHANNEL_NODATA
+        }
+        Err(_) => {
+            query.as_rust_type_mut_uninit().write(None);
+            result::Z_CHANNEL_DISCONNECTED
         }
     }
 }
diff --git a/src/closures/response_channel.rs b/src/closures/response_channel.rs
index abff70dc6..9e7f26271 100644
--- a/src/closures/response_channel.rs
+++ b/src/closures/response_channel.rs
@@ -16,7 +16,7 @@ use std::{mem::MaybeUninit, sync::Arc};
 
 use libc::c_void;
 use zenoh::{
-    handlers::{self, IntoHandler, RingChannelHandler},
+    handlers::{self, FifoChannelHandler, IntoHandler, RingChannelHandler},
     query::Reply,
 };
 
@@ -29,7 +29,7 @@ use crate::{
     z_loaned_reply_t, z_owned_closure_reply_t, z_owned_reply_t,
 };
 decl_c_type!(
-    owned(z_owned_fifo_handler_reply_t, option flume::Receiver<Reply>),
+    owned(z_owned_fifo_handler_reply_t, option FifoChannelHandler<Reply>),
     loaned(z_loaned_fifo_handler_reply_t),
 );
 
@@ -132,16 +132,17 @@ pub extern "C" fn z_fifo_handler_reply_try_recv(
     reply: &mut MaybeUninit<z_owned_reply_t>,
 ) -> z_result_t {
     match this.as_rust_type_ref().try_recv() {
-        Ok(q) => {
+        Ok(Some(q)) => {
             reply.as_rust_type_mut_uninit().write(Some(q));
             result::Z_OK
         }
-        Err(e) => {
+        Ok(None) => {
             reply.as_rust_type_mut_uninit().write(None);
-            match e {
-                flume::TryRecvError::Empty => result::Z_CHANNEL_NODATA,
-                flume::TryRecvError::Disconnected => result::Z_CHANNEL_DISCONNECTED,
-            }
+            result::Z_CHANNEL_NODATA
+        }
+        Err(_) => {
+            reply.as_rust_type_mut_uninit().write(None);
+            result::Z_CHANNEL_DISCONNECTED
         }
     }
 }
diff --git a/src/closures/sample_channel.rs b/src/closures/sample_channel.rs
index 492e4cb7e..4b9266261 100644
--- a/src/closures/sample_channel.rs
+++ b/src/closures/sample_channel.rs
@@ -16,7 +16,7 @@ use std::{mem::MaybeUninit, sync::Arc};
 
 use libc::c_void;
 use zenoh::{
-    handlers::{self, IntoHandler, RingChannelHandler},
+    handlers::{self, FifoChannelHandler, IntoHandler, RingChannelHandler},
     sample::Sample,
 };
 
@@ -29,7 +29,7 @@ use crate::{
     z_loaned_sample_t, z_owned_closure_sample_t, z_owned_sample_t,
 };
 decl_c_type!(
-    owned(z_owned_fifo_handler_sample_t, option flume::Receiver<Sample>),
+    owned(z_owned_fifo_handler_sample_t, option FifoChannelHandler<Sample>),
     loaned(z_loaned_fifo_handler_sample_t),
 );
 
@@ -133,16 +133,17 @@ pub extern "C" fn z_fifo_handler_sample_try_recv(
     sample: &mut MaybeUninit<z_owned_sample_t>,
 ) -> z_result_t {
     match this.as_rust_type_ref().try_recv() {
-        Ok(q) => {
+        Ok(Some(q)) => {
             sample.as_rust_type_mut_uninit().write(Some(q));
             result::Z_OK
         }
-        Err(e) => {
+        Ok(None) => {
             sample.as_rust_type_mut_uninit().write(None);
-            match e {
-                flume::TryRecvError::Empty => result::Z_CHANNEL_NODATA,
-                flume::TryRecvError::Disconnected => result::Z_CHANNEL_DISCONNECTED,
-            }
+            result::Z_CHANNEL_NODATA
+        }
+        Err(_) => {
+            sample.as_rust_type_mut_uninit().write(None);
+            result::Z_CHANNEL_DISCONNECTED
         }
     }
 }