diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index 924f4cd6..5bcafb95 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -74,6 +74,21 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.89"
@@ -276,6 +291,19 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "chrono"
+version = "0.4.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "serde",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -296,7 +324,7 @@ dependencies = [
  "bitflags 1.3.2",
  "clap_lex",
  "indexmap 1.9.3",
- "strsim",
+ "strsim 0.10.0",
  "termcolor",
  "textwrap",
 ]
@@ -396,6 +424,41 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "darling"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.11.1",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.77",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.6.0"
@@ -434,6 +497,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
  "powerfmt",
+ "serde",
 ]
 
 [[package]]
@@ -734,6 +798,12 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
 [[package]]
 name = "hmac"
 version = "0.12.1"
@@ -775,6 +845,35 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
+[[package]]
+name = "iana-time-zone"
+version = "0.1.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -793,6 +892,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
  "hashbrown 0.12.3",
+ "serde",
 ]
 
 [[package]]
@@ -803,6 +903,7 @@ checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.5",
+ "serde",
 ]
 
 [[package]]
@@ -1938,6 +2039,36 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_with"
+version = "3.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
+dependencies = [
+ "base64 0.22.1",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.5.0",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
+
 [[package]]
 name = "serde_yaml"
 version = "0.9.34+deprecated"
@@ -2079,6 +2210,12 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "subtle"
 version = "2.6.1"
@@ -2654,6 +2791,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
@@ -2888,7 +3034,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "ahash",
  "async-trait",
@@ -2935,7 +3081,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "zenoh-collections",
 ]
@@ -2943,7 +3089,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "tracing",
  "uhlc",
@@ -2954,18 +3100,19 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 
 [[package]]
 name = "zenoh-config"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "json5",
  "num_cpus",
  "secrecy",
  "serde",
  "serde_json",
+ "serde_with",
  "serde_yaml",
  "tracing",
  "uhlc",
@@ -2981,7 +3128,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -2992,7 +3139,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "aes",
  "hmac",
@@ -3005,7 +3152,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3024,7 +3171,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "getrandom",
  "hashbrown 0.14.5",
@@ -3039,7 +3186,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3056,7 +3203,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -3080,7 +3227,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3107,7 +3254,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3124,7 +3271,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3153,7 +3300,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "async-trait",
  "socket2",
@@ -3172,7 +3319,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "async-trait",
  "nix",
@@ -3190,7 +3337,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -3210,7 +3357,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3221,7 +3368,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "git-version",
  "libloading",
@@ -3237,7 +3384,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "const_format",
  "rand",
@@ -3251,7 +3398,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "anyhow",
 ]
@@ -3259,7 +3406,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "lazy_static",
  "ron",
@@ -3273,7 +3420,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "event-listener",
  "futures",
@@ -3286,7 +3433,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "futures",
  "tokio",
@@ -3299,7 +3446,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -3332,7 +3479,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.2.1"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=release/1.2.1#4af922f701c57e270081ab1f8fd5e6ca6c2d65f5"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#3bfaa0f21add1ddb99390ec7779880f62340d157"
 dependencies = [
  "async-trait",
  "const_format",
diff --git a/zenoh-jni/Cargo.toml b/zenoh-jni/Cargo.toml
index 26f4ec23..b06d387f 100644
--- a/zenoh-jni/Cargo.toml
+++ b/zenoh-jni/Cargo.toml
@@ -36,8 +36,8 @@ flume = "0.10.14"
 uhlc = "0.8.0"
 json5 = "0.4.1"
 serde_yaml = "0.9.19"
-zenoh = { version = "1.2.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/1.2.1", features = ["unstable", "internal"], default-features = false }
-zenoh-ext = { version = "1.2.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "release/1.2.1", features = ["internal"], default-features = false, optional = true }
+zenoh = { version = "1.2.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["unstable", "internal"], default-features = false }
+zenoh-ext = { version = "1.2.1", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["internal"], default-features = false, optional = true }
 tracing = { version = "0.1" , features = ["log"] }
 [lib]
 name = "zenoh_jni"