diff --git a/Cargo.lock b/Cargo.lock
index 683f5311f..34eade70f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3705,7 +3705,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3752,7 +3752,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3790,7 +3790,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3802,12 +3802,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "json5",
  "num_cpus",
@@ -3828,7 +3828,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3839,7 +3839,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "aes",
  "hmac",
@@ -3852,7 +3852,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "bincode",
  "flume",
@@ -3869,7 +3869,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "hashbrown 0.14.5",
  "keyed-set",
@@ -3883,7 +3883,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3903,7 +3903,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "flume",
@@ -3926,7 +3926,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3951,7 +3951,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-serial"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "tokio",
@@ -3969,7 +3969,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -3986,7 +3986,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -4013,7 +4013,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "socket2 0.5.7",
@@ -4032,7 +4032,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixpipe"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -4054,7 +4054,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "nix 0.29.0",
@@ -4072,7 +4072,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-vsock"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "libc",
@@ -4090,7 +4090,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4110,7 +4110,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4121,7 +4121,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "git-version",
  "libloading",
@@ -4137,7 +4137,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "const_format",
  "rand",
@@ -4151,7 +4151,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "anyhow",
 ]
@@ -4159,7 +4159,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4172,7 +4172,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -4195,7 +4195,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "event-listener 5.3.1",
  "futures",
@@ -4208,7 +4208,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "futures",
  "tokio",
@@ -4221,7 +4221,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4255,7 +4255,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "const_format",
diff --git a/build-resources/opaque-types/Cargo.lock b/build-resources/opaque-types/Cargo.lock
index 9a5c80158..8b6315681 100644
--- a/build-resources/opaque-types/Cargo.lock
+++ b/build-resources/opaque-types/Cargo.lock
@@ -3097,7 +3097,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "ahash",
  "async-trait",
@@ -3144,7 +3144,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3152,7 +3152,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3164,12 +3164,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 
 [[package]]
 name = "zenoh-config"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "json5",
  "num_cpus",
@@ -3190,7 +3190,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3201,7 +3201,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "aes",
  "hmac",
@@ -3214,7 +3214,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "bincode",
  "flume",
@@ -3231,7 +3231,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "hashbrown",
  "keyed-set",
@@ -3245,7 +3245,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3265,7 +3265,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "flume",
@@ -3288,7 +3288,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3313,7 +3313,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-serial"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "tokio",
@@ -3331,7 +3331,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3348,7 +3348,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3375,7 +3375,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3394,7 +3394,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixpipe"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -3416,7 +3416,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "nix 0.29.0",
@@ -3434,7 +3434,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-vsock"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "libc",
@@ -3452,7 +3452,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3472,7 +3472,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3483,7 +3483,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "git-version",
  "libloading",
@@ -3499,7 +3499,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "const_format",
  "rand",
@@ -3513,7 +3513,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "anyhow",
 ]
@@ -3521,7 +3521,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3534,7 +3534,7 @@ dependencies = [
 [[package]]
 name = "zenoh-shm"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "advisory-lock",
  "async-trait",
@@ -3557,7 +3557,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "event-listener",
  "futures",
@@ -3570,7 +3570,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "futures",
  "tokio",
@@ -3583,7 +3583,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3617,7 +3617,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.0.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#f26436102134abaa8fd3dc1716cc12230a532740"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#1576c77d1c8f0c2336060cc1577e6e0cc215b501"
 dependencies = [
  "async-trait",
  "const_format",
diff --git a/build-resources/opaque-types/src/lib.rs b/build-resources/opaque-types/src/lib.rs
index 757e620d6..10c90db9e 100644
--- a/build-resources/opaque-types/src/lib.rs
+++ b/build-resources/opaque-types/src/lib.rs
@@ -314,9 +314,6 @@ get_opaque_type_data!(MemoryLayout, z_loaned_memory_layout_t);
 /// @brief An owned ChunkAllocResult.
 get_opaque_type_data!(Option<ChunkAllocResult>, z_owned_chunk_alloc_result_t);
 #[cfg(all(feature = "shared-memory", feature = "unstable"))]
-/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
-/// @brief A loaned ChunkAllocResult.
-get_opaque_type_data!(ChunkAllocResult, z_loaned_chunk_alloc_result_t);
 
 #[cfg(all(feature = "shared-memory", feature = "unstable"))]
 /// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
diff --git a/include/zenoh_commons.h b/include/zenoh_commons.h
index 0264f8d8f..ff10b08f6 100644
--- a/include/zenoh_commons.h
+++ b/include/zenoh_commons.h
@@ -1355,14 +1355,6 @@ z_result_t z_bytes_writer_write_all(struct z_loaned_bytes_writer_t *this_,
 ZENOHC_API
 void z_chunk_alloc_result_drop(struct z_moved_chunk_alloc_result_t *this_);
 #endif
-/**
- * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
- * @brief Borrows Chunk Alloc Result.
- */
-#if (defined(Z_FEATURE_SHARED_MEMORY) && defined(Z_FEATURE_UNSTABLE_API))
-ZENOHC_API
-const struct z_loaned_chunk_alloc_result_t *z_chunk_alloc_result_loan(const struct z_owned_chunk_alloc_result_t *this_);
-#endif
 /**
  * @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
  * @brief Creates a new Chunk Alloc Result with Error value.
diff --git a/include/zenoh_macros.h b/include/zenoh_macros.h
index b12114f3e..9bc08707c 100644
--- a/include/zenoh_macros.h
+++ b/include/zenoh_macros.h
@@ -59,7 +59,6 @@ static inline ze_moved_serializer_t* ze_serializer_move(ze_owned_serializer_t* x
         z_owned_alloc_layout_t : z_alloc_layout_loan, \
         z_owned_bytes_t : z_bytes_loan, \
         z_owned_bytes_writer_t : z_bytes_writer_loan, \
-        z_owned_chunk_alloc_result_t : z_chunk_alloc_result_loan, \
         z_owned_closure_hello_t : z_closure_hello_loan, \
         z_owned_closure_query_t : z_closure_query_loan, \
         z_owned_closure_reply_t : z_closure_reply_loan, \
@@ -560,7 +559,6 @@ static inline ze_moved_serializer_t* ze_serializer_move(ze_owned_serializer_t* x
 inline const z_loaned_alloc_layout_t* z_loan(const z_owned_alloc_layout_t& this_) { return z_alloc_layout_loan(&this_); };
 inline const z_loaned_bytes_t* z_loan(const z_owned_bytes_t& this_) { return z_bytes_loan(&this_); };
 inline const z_loaned_bytes_writer_t* z_loan(const z_owned_bytes_writer_t& this_) { return z_bytes_writer_loan(&this_); };
-inline const z_loaned_chunk_alloc_result_t* z_loan(const z_owned_chunk_alloc_result_t& this_) { return z_chunk_alloc_result_loan(&this_); };
 inline const z_loaned_closure_hello_t* z_loan(const z_owned_closure_hello_t& closure) { return z_closure_hello_loan(&closure); };
 inline const z_loaned_closure_query_t* z_loan(const z_owned_closure_query_t& closure) { return z_closure_query_loan(&closure); };
 inline const z_loaned_closure_reply_t* z_loan(const z_owned_closure_reply_t& closure) { return z_closure_reply_loan(&closure); };
@@ -1170,8 +1168,6 @@ template<> struct z_loaned_to_owned_type_t<z_loaned_bytes_t> { typedef z_owned_b
 template<> struct z_owned_to_loaned_type_t<z_owned_bytes_t> { typedef z_loaned_bytes_t type; };
 template<> struct z_loaned_to_owned_type_t<z_loaned_bytes_writer_t> { typedef z_owned_bytes_writer_t type; };
 template<> struct z_owned_to_loaned_type_t<z_owned_bytes_writer_t> { typedef z_loaned_bytes_writer_t type; };
-template<> struct z_loaned_to_owned_type_t<z_loaned_chunk_alloc_result_t> { typedef z_owned_chunk_alloc_result_t type; };
-template<> struct z_owned_to_loaned_type_t<z_owned_chunk_alloc_result_t> { typedef z_loaned_chunk_alloc_result_t type; };
 template<> struct z_loaned_to_owned_type_t<z_loaned_closure_hello_t> { typedef z_owned_closure_hello_t type; };
 template<> struct z_owned_to_loaned_type_t<z_owned_closure_hello_t> { typedef z_loaned_closure_hello_t type; };
 template<> struct z_loaned_to_owned_type_t<z_loaned_closure_query_t> { typedef z_owned_closure_query_t type; };
diff --git a/splitguide.yaml b/splitguide.yaml
index b1f5c3d29..ae3d53895 100644
--- a/splitguide.yaml
+++ b/splitguide.yaml
@@ -79,7 +79,6 @@ zenoh_opaque.h:
   - z_owned_memory_layout_t!#shared-memory#unstable
   - z_loaned_memory_layout_t!#shared-memory#unstable
   - z_owned_chunk_alloc_result_t!#shared-memory#unstable
-  - z_loaned_chunk_alloc_result_t!#shared-memory#unstable
   - z_owned_shm_t!#shared-memory#unstable
   - z_loaned_shm_t!#shared-memory#unstable
   - z_owned_shm_mut_t!#shared-memory#unstable
diff --git a/src/shm/provider/shm_provider_backend.rs b/src/shm/provider/shm_provider_backend.rs
index 21eda93b1..d5238624e 100644
--- a/src/shm/provider/shm_provider_backend.rs
+++ b/src/shm/provider/shm_provider_backend.rs
@@ -74,9 +74,7 @@ where
             );
             match result.assume_init().as_rust_type_mut().take() {
                 Some(val) => val,
-                None => Err(zenoh::shm::ZAllocError::Other(
-                    "Callback returned empty result".into(),
-                )),
+                None => Err(zenoh::shm::ZAllocError::Other),
             }
         }
     }
diff --git a/src/shm/provider/types.rs b/src/shm/provider/types.rs
index 59a1b2ec2..e1e03ca57 100644
--- a/src/shm/provider/types.rs
+++ b/src/shm/provider/types.rs
@@ -14,12 +14,9 @@
 
 use std::mem::MaybeUninit;
 
-use zenoh::{
-    internal::zerror,
-    shm::{
-        AllocAlignment, BufAllocResult, BufLayoutAllocResult, ChunkAllocResult, MemoryLayout,
-        ZAllocError, ZLayoutError,
-    },
+use zenoh::shm::{
+    AllocAlignment, BufAllocResult, BufLayoutAllocResult, ChunkAllocResult, MemoryLayout,
+    ZAllocError, ZLayoutError,
 };
 
 use super::chunk::z_allocated_chunk_t;
@@ -27,9 +24,8 @@ use crate::{
     result::{z_result_t, Z_EINVAL, Z_OK},
     shm::buffer::zshmmut::z_internal_shm_mut_null,
     transmute::{IntoCType, LoanedCTypeRef, RustTypeRef, RustTypeRefUninit, TakeRustType},
-    z_loaned_chunk_alloc_result_t, z_loaned_memory_layout_t, z_moved_chunk_alloc_result_t,
-    z_moved_memory_layout_t, z_owned_chunk_alloc_result_t, z_owned_memory_layout_t,
-    z_owned_shm_mut_t,
+    z_loaned_memory_layout_t, z_moved_chunk_alloc_result_t, z_moved_memory_layout_t,
+    z_owned_chunk_alloc_result_t, z_owned_memory_layout_t, z_owned_shm_mut_t,
 };
 
 /// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
@@ -51,7 +47,7 @@ impl From<ZAllocError> for z_alloc_error_t {
         match value {
             ZAllocError::NeedDefragment => z_alloc_error_t::NEED_DEFRAGMENT,
             ZAllocError::OutOfMemory => z_alloc_error_t::OUT_OF_MEMORY,
-            ZAllocError::Other(_) => z_alloc_error_t::OTHER,
+            ZAllocError::Other => z_alloc_error_t::OTHER,
         }
     }
 }
@@ -62,7 +58,7 @@ impl From<z_alloc_error_t> for ZAllocError {
         match value {
             z_alloc_error_t::NEED_DEFRAGMENT => ZAllocError::NeedDefragment,
             z_alloc_error_t::OUT_OF_MEMORY => ZAllocError::OutOfMemory,
-            z_alloc_error_t::OTHER => ZAllocError::Other(zerror!("other error").into()),
+            z_alloc_error_t::OTHER => ZAllocError::Other,
         }
     }
 }
@@ -194,7 +190,6 @@ pub extern "C" fn z_memory_layout_get_data(
 
 decl_c_type!(
     owned(z_owned_chunk_alloc_result_t, option ChunkAllocResult),
-    loaned(z_loaned_chunk_alloc_result_t),
 );
 
 /// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
@@ -242,19 +237,6 @@ pub extern "C" fn z_internal_chunk_alloc_result_check(
     this_.as_rust_type_ref().is_some()
 }
 
-/// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
-/// @brief Borrows Chunk Alloc Result.
-#[no_mangle]
-#[allow(clippy::missing_safety_doc)]
-pub unsafe extern "C" fn z_chunk_alloc_result_loan(
-    this: &z_owned_chunk_alloc_result_t,
-) -> &z_loaned_chunk_alloc_result_t {
-    this.as_rust_type_ref()
-        .as_ref()
-        .unwrap_unchecked()
-        .as_loaned_c_type_ref()
-}
-
 /// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future release.
 /// @brief Deletes Chunk Alloc Result.
 #[no_mangle]