diff --git a/Cargo.lock b/Cargo.lock
index b85dc17296..7cb059be27 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1111,7 +1111,7 @@ dependencies = [
 [[package]]
 name = "bp-bridge-hub-cumulus"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6a021c8bbc0cdf1e38805e6140a509fc4e27a56d"
 dependencies = [
  "bp-messages",
  "bp-polkadot-core",
@@ -1120,13 +1120,13 @@ dependencies = [
  "frame-system",
  "polkadot-primitives",
  "sp-api",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-bridge-hub-kusama"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-bridge-hub-cumulus",
  "bp-messages",
@@ -1134,13 +1134,13 @@ dependencies = [
  "frame-support",
  "sp-api",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-bridge-hub-polkadot"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-bridge-hub-cumulus",
  "bp-messages",
@@ -1148,13 +1148,13 @@ dependencies = [
  "frame-support",
  "sp-api",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-bridge-hub-rococo"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-bridge-hub-cumulus",
  "bp-messages",
@@ -1162,13 +1162,13 @@ dependencies = [
  "frame-support",
  "sp-api",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-bridge-hub-westend"
 version = "0.3.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-bridge-hub-cumulus",
  "bp-messages",
@@ -1176,13 +1176,13 @@ dependencies = [
  "frame-support",
  "sp-api",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-header-chain"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-runtime",
  "finality-grandpa",
@@ -1193,26 +1193,26 @@ dependencies = [
  "sp-consensus-grandpa",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-kusama"
 version = "0.5.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-header-chain",
  "bp-polkadot-core",
  "bp-runtime",
  "frame-support",
  "sp-api",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-messages"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-header-chain",
  "bp-runtime",
@@ -1221,13 +1221,13 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-parachains"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-header-chain",
  "bp-polkadot-core",
@@ -1238,26 +1238,26 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-polkadot"
 version = "0.5.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-header-chain",
  "bp-polkadot-core",
  "bp-runtime",
  "frame-support",
  "sp-api",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-polkadot-bulletin"
 version = "0.4.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-header-chain",
  "bp-messages",
@@ -1269,13 +1269,13 @@ dependencies = [
  "scale-info",
  "sp-api",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-polkadot-core"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -1287,13 +1287,13 @@ dependencies = [
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-relayers"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -1301,26 +1301,26 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-rococo"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-header-chain",
  "bp-polkadot-core",
  "bp-runtime",
  "frame-support",
  "sp-api",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-runtime"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1335,7 +1335,7 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-trie",
  "trie-db",
 ]
@@ -1343,7 +1343,7 @@ dependencies = [
 [[package]]
 name = "bp-test-utils"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-header-chain",
  "bp-parachains",
@@ -1356,35 +1356,35 @@ dependencies = [
  "sp-consensus-grandpa",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-trie",
 ]
 
 [[package]]
 name = "bp-westend"
 version = "0.3.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-header-chain",
  "bp-polkadot-core",
  "bp-runtime",
  "frame-support",
  "sp-api",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-xcm-bridge-hub"
 version = "0.2.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "bp-xcm-bridge-hub-router"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -1395,7 +1395,7 @@ dependencies = [
 [[package]]
 name = "bridge-runtime-common"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-header-chain",
  "bp-messages",
@@ -1421,7 +1421,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-trie",
  "staging-xcm",
  "staging-xcm-builder",
@@ -2591,7 +2591,7 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 [[package]]
 name = "equivocation-detector"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2782,7 +2782,7 @@ dependencies = [
 [[package]]
 name = "finality-relay"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2881,7 +2881,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 [[package]]
 name = "frame-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -2897,9 +2897,9 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "static_assertions",
 ]
 
@@ -2929,7 +2929,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "aquamarine",
  "array-bytes",
@@ -2952,7 +2952,7 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-crypto-hashing-proc-macro",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
@@ -2960,8 +2960,8 @@ dependencies = [
  "sp-runtime",
  "sp-staking",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-weights",
  "static_assertions",
  "tt-call",
@@ -2970,7 +2970,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -2982,14 +2982,14 @@ dependencies = [
  "proc-macro-warning",
  "proc-macro2 1.0.83",
  "quote 1.0.36",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "syn 2.0.60",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 3.1.0",
@@ -3001,7 +3001,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "proc-macro2 1.0.83",
  "quote 1.0.36",
@@ -3011,7 +3011,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "cfg-if",
  "docify",
@@ -3023,7 +3023,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-version",
  "sp-weights",
 ]
@@ -4603,9 +4603,9 @@ dependencies = [
 
 [[package]]
 name = "litep2p"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adf107268459b653df189050c9ae2301253b9c62ceafa993dc69dad29870155c"
+checksum = "7f02542ae3a94b4c4ffa37dc56388c923e286afa3bf65452e3984b50b2a2f316"
 dependencies = [
  "async-trait",
  "bs58 0.4.0",
@@ -4617,7 +4617,7 @@ dependencies = [
  "hex-literal",
  "indexmap 2.2.6",
  "libc",
- "mockall",
+ "mockall 0.12.1",
  "multiaddr",
  "multihash 0.17.0",
  "network-interface",
@@ -4856,7 +4856,7 @@ dependencies = [
 [[package]]
 name = "messages-relay"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "async-std",
  "async-trait",
@@ -4939,8 +4939,23 @@ dependencies = [
  "downcast",
  "fragile",
  "lazy_static",
- "mockall_derive",
- "predicates",
+ "mockall_derive 0.11.4",
+ "predicates 2.1.5",
+ "predicates-tree",
+]
+
+[[package]]
+name = "mockall"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48"
+dependencies = [
+ "cfg-if",
+ "downcast",
+ "fragile",
+ "lazy_static",
+ "mockall_derive 0.12.1",
+ "predicates 3.1.0",
  "predicates-tree",
 ]
 
@@ -4956,6 +4971,18 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "mockall_derive"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2"
+dependencies = [
+ "cfg-if",
+ "proc-macro2 1.0.83",
+ "quote 1.0.36",
+ "syn 2.0.60",
+]
+
 [[package]]
 name = "multiaddr"
 version = "0.17.1"
@@ -5420,7 +5447,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 [[package]]
 name = "pallet-authorship"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5428,13 +5455,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "pallet-balances"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5444,13 +5471,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "pallet-bridge-grandpa"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-header-chain",
  "bp-runtime",
@@ -5464,14 +5491,14 @@ dependencies = [
  "scale-info",
  "sp-consensus-grandpa",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-trie",
 ]
 
 [[package]]
 name = "pallet-bridge-messages"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -5483,13 +5510,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "pallet-bridge-parachains"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-header-chain",
  "bp-parachains",
@@ -5503,14 +5530,14 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-trie",
 ]
 
 [[package]]
 name = "pallet-bridge-relayers"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bp-messages",
  "bp-relayers",
@@ -5524,13 +5551,13 @@ dependencies = [
  "scale-info",
  "sp-arithmetic",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "pallet-grandpa"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5547,13 +5574,13 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "pallet-session"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5568,14 +5595,14 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-trie",
 ]
 
 [[package]]
 name = "pallet-timestamp"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5587,15 +5614,15 @@ dependencies = [
  "sp-inherents",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "pallet-transaction-payment"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5605,13 +5632,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5623,7 +5650,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5633,13 +5660,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "parachains-relay"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "async-std",
  "async-trait",
@@ -5917,19 +5944,19 @@ checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
 [[package]]
 name = "polkadot-core-primitives"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "polkadot-parachain-primitives"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bounded-collections",
  "derive_more",
@@ -5939,14 +5966,14 @@ dependencies = [
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-weights",
 ]
 
 [[package]]
 name = "polkadot-primitives"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bitvec",
  "hex-literal",
@@ -5967,7 +5994,7 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
@@ -6118,6 +6145,16 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "predicates"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8"
+dependencies = [
+ "anstyle",
+ "predicates-core",
+]
+
 [[package]]
 name = "predicates-core"
 version = "1.0.6"
@@ -6336,7 +6373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1"
 dependencies = [
  "bytes",
- "heck 0.4.1",
+ "heck 0.5.0",
  "itertools 0.12.1",
  "log",
  "multimap",
@@ -6431,6 +6468,17 @@ dependencies = [
  "unsigned-varint",
 ]
 
+[[package]]
+name = "quick_cache"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5253a3a0d56548d5b0be25414171dc780cc6870727746d05bd2bde352eee96c5"
+dependencies = [
+ "ahash 0.8.11",
+ "hashbrown 0.13.2",
+ "parking_lot 0.12.1",
+]
+
 [[package]]
 name = "quicksink"
 version = "0.1.2"
@@ -6940,7 +6988,7 @@ dependencies = [
 [[package]]
 name = "relay-substrate-client"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "async-std",
  "async-trait",
@@ -6961,6 +7009,7 @@ dependencies = [
  "pallet-transaction-payment-rpc-runtime-api",
  "pallet-utility",
  "parity-scale-codec",
+ "quick_cache",
  "rand 0.8.5",
  "relay-utils",
  "sc-chain-spec",
@@ -6971,7 +7020,7 @@ dependencies = [
  "sp-core",
  "sp-rpc",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-trie",
  "sp-version",
  "staging-xcm",
@@ -6982,7 +7031,7 @@ dependencies = [
 [[package]]
 name = "relay-utils"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -7357,18 +7406,18 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "log",
  "sp-core",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "thiserror",
 ]
 
 [[package]]
 name = "sc-chain-spec"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "array-bytes",
  "docify",
@@ -7384,18 +7433,18 @@ dependencies = [
  "serde_json",
  "sp-blockchain",
  "sp-core",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-genesis-builder",
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "sc-chain-spec-derive"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.83",
@@ -7406,7 +7455,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "fnv",
  "futures",
@@ -7421,11 +7470,11 @@ dependencies = [
  "sp-consensus",
  "sp-core",
  "sp-database",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-runtime",
  "sp-state-machine",
  "sp-statement-store",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-trie",
  "substrate-prometheus-endpoint",
 ]
@@ -7433,13 +7482,13 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
  "log",
- "mockall",
+ "mockall 0.11.4",
  "parking_lot 0.12.1",
  "sc-client-api",
  "sc-network-types",
@@ -7458,7 +7507,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -7468,25 +7517,25 @@ dependencies = [
  "schnellru",
  "sp-api",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-io",
  "sp-panic-handler",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-trie",
  "sp-version",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "tracing",
 ]
 
 [[package]]
 name = "sc-executor-common"
 version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "polkavm",
  "sc-allocator",
  "sp-maybe-compressed-blob",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "thiserror",
  "wasm-instrument",
 ]
@@ -7494,18 +7543,18 @@ dependencies = [
 [[package]]
 name = "sc-executor-polkavm"
 version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "log",
  "polkavm",
  "sc-executor-common",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -7515,15 +7564,15 @@ dependencies = [
  "rustix 0.36.17",
  "sc-allocator",
  "sc-executor-common",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "wasmtime",
 ]
 
 [[package]]
 name = "sc-mixnet"
 version = "0.4.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "array-bytes",
  "arrayvec 0.7.4",
@@ -7552,7 +7601,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "array-bytes",
  "async-channel 1.9.0",
@@ -7569,7 +7618,7 @@ dependencies = [
  "linked_hash_set",
  "litep2p",
  "log",
- "mockall",
+ "mockall 0.11.4",
  "once_cell",
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -7603,7 +7652,7 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "async-trait",
  "bitflags 1.3.2",
@@ -7621,7 +7670,7 @@ dependencies = [
 [[package]]
 name = "sc-network-types"
 version = "0.10.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bs58 0.5.1",
  "ed25519-dalek 2.1.1",
@@ -7637,7 +7686,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -7657,7 +7706,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "chrono",
  "futures",
@@ -7677,7 +7726,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "async-trait",
  "futures",
@@ -7693,7 +7742,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "async-channel 1.9.0",
  "futures",
@@ -7900,9 +7949,9 @@ dependencies = [
 
 [[package]]
 name = "sctp-proto"
-version = "0.1.7"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f64cef148d3295c730c3cb340b0b252a4d570b1c7d4bf0808f88540b0a888bc"
+checksum = "b6220f78bb44c15f326b0596113305f6101097a18755d53727a575c97e09fb24"
 dependencies = [
  "bytes",
  "crc",
@@ -7986,9 +8035,9 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 
 [[package]]
 name = "serde"
-version = "1.0.203"
+version = "1.0.202"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
 dependencies = [
  "serde_derive",
 ]
@@ -8004,9 +8053,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.203"
+version = "1.0.202"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
 dependencies = [
  "proc-macro2 1.0.83",
  "quote 1.0.36",
@@ -8409,7 +8458,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "hash-db",
  "log",
@@ -8417,12 +8466,12 @@ dependencies = [
  "scale-info",
  "sp-api-proc-macro",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-metadata-ir",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-trie",
  "sp-version",
  "thiserror",
@@ -8431,7 +8480,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "Inflector",
  "blake2 0.10.6",
@@ -8445,20 +8494,20 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "30.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-core",
  "sp-io",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "sp-arithmetic"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "docify",
  "integer-sqrt",
@@ -8466,7 +8515,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "static_assertions",
 ]
 
@@ -8491,7 +8540,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8503,7 +8552,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "futures",
  "log",
@@ -8521,7 +8570,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "async-trait",
  "futures",
@@ -8536,7 +8585,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-grandpa"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8553,7 +8602,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8564,7 +8613,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "array-bytes",
  "bandersnatch_vrfs",
@@ -8594,12 +8643,12 @@ dependencies = [
  "secp256k1",
  "secrecy",
  "serde",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "ss58-registry",
  "substrate-bip39",
  "thiserror",
@@ -8611,7 +8660,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-ec-utils"
 version = "0.10.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk#48d4f654612a67787426de426e462bd40f6f70f6"
 dependencies = [
  "ark-bls12-377",
  "ark-bls12-377-ext",
@@ -8645,7 +8694,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-hashing"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -8658,17 +8707,17 @@ dependencies = [
 [[package]]
 name = "sp-crypto-hashing-proc-macro"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "quote 1.0.36",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "syn 2.0.60",
 ]
 
 [[package]]
 name = "sp-database"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -8677,7 +8726,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "proc-macro2 1.0.83",
  "quote 1.0.36",
@@ -8687,7 +8736,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk#48d4f654612a67787426de426e462bd40f6f70f6"
 dependencies = [
  "proc-macro2 1.0.83",
  "quote 1.0.36",
@@ -8697,17 +8746,17 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.25.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "environmental",
  "parity-scale-codec",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "sp-externalities"
 version = "0.25.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk#48d4f654612a67787426de426e462bd40f6f70f6"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8717,7 +8766,7 @@ dependencies = [
 [[package]]
 name = "sp-genesis-builder"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8729,7 +8778,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -8742,7 +8791,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "30.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bytes",
  "ed25519-dalek 2.1.1",
@@ -8753,13 +8802,13 @@ dependencies = [
  "rustversion",
  "secp256k1",
  "sp-core",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-keystore",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-trie",
  "tracing",
  "tracing-core",
@@ -8768,7 +8817,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "31.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "sp-core",
  "sp-runtime",
@@ -8778,18 +8827,18 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "thiserror",
  "zstd 0.12.4",
@@ -8798,7 +8847,7 @@ dependencies = [
 [[package]]
 name = "sp-metadata-ir"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "frame-metadata 16.0.0",
  "parity-scale-codec",
@@ -8808,7 +8857,7 @@ dependencies = [
 [[package]]
 name = "sp-mixnet"
 version = "0.4.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8819,7 +8868,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -8829,7 +8878,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -8839,7 +8888,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "31.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "docify",
  "either",
@@ -8857,33 +8906,33 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-io",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-weights",
 ]
 
 [[package]]
 name = "sp-runtime-interface"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "polkavm-derive",
  "primitive-types",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "static_assertions",
 ]
 
 [[package]]
 name = "sp-runtime-interface"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk#48d4f654612a67787426de426e462bd40f6f70f6"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -8902,7 +8951,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "Inflector",
  "expander",
@@ -8915,7 +8964,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk#48d4f654612a67787426de426e462bd40f6f70f6"
 dependencies = [
  "Inflector",
  "expander",
@@ -8928,7 +8977,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8942,7 +8991,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8955,7 +9004,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "hash-db",
  "log",
@@ -8964,7 +9013,7 @@ dependencies = [
  "rand 0.8.5",
  "smallvec",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-panic-handler",
  "sp-trie",
  "thiserror",
@@ -8975,7 +9024,7 @@ dependencies = [
 [[package]]
 name = "sp-statement-store"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "aes-gcm",
  "curve25519-dalek 4.1.2",
@@ -8988,10 +9037,10 @@ dependencies = [
  "sp-api",
  "sp-application-crypto",
  "sp-core",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "thiserror",
  "x25519-dalek 2.0.1",
 ]
@@ -8999,29 +9048,29 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk#48d4f654612a67787426de426e462bd40f6f70f6"
 
 [[package]]
 name = "sp-storage"
 version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
  "ref-cast",
  "serde",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
 name = "sp-storage"
 version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk#48d4f654612a67787426de426e462bd40f6f70f6"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9033,7 +9082,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9045,7 +9094,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "parity-scale-codec",
  "tracing",
@@ -9056,7 +9105,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk#48d4f654612a67787426de426e462bd40f6f70f6"
 dependencies = [
  "parity-scale-codec",
  "tracing",
@@ -9067,7 +9116,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "ahash 0.8.11",
  "hash-db",
@@ -9080,7 +9129,7 @@ dependencies = [
  "scale-info",
  "schnellru",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "thiserror",
  "tracing",
  "trie-db",
@@ -9090,7 +9139,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9099,7 +9148,7 @@ dependencies = [
  "serde",
  "sp-crypto-hashing-proc-macro",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-version-proc-macro",
  "thiserror",
 ]
@@ -9107,7 +9156,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2 1.0.83",
@@ -9118,7 +9167,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
@@ -9130,7 +9179,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk#48d4f654612a67787426de426e462bd40f6f70f6"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -9140,7 +9189,7 @@ dependencies = [
 [[package]]
 name = "sp-weights"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "bounded-collections",
  "parity-scale-codec",
@@ -9148,7 +9197,7 @@ dependencies = [
  "serde",
  "smallvec",
  "sp-arithmetic",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
 ]
 
 [[package]]
@@ -9197,7 +9246,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 [[package]]
 name = "staging-xcm"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "array-bytes",
  "bounded-collections",
@@ -9215,7 +9264,7 @@ dependencies = [
 [[package]]
 name = "staging-xcm-builder"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -9228,7 +9277,7 @@ dependencies = [
  "sp-arithmetic",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-weights",
  "staging-xcm",
  "staging-xcm-executor",
@@ -9237,7 +9286,7 @@ dependencies = [
 [[package]]
 name = "staging-xcm-executor"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -9250,7 +9299,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=master)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits)",
  "sp-weights",
  "staging-xcm",
 ]
@@ -9263,17 +9312,17 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "str0m"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3f10d3f68e60168d81110410428a435dbde28cc5525f5f7c6fdec92dbdc2800"
+checksum = "6706347e49b13373f7ddfafad47df7583ed52083d6fc8a594eb2c80497ef959d"
 dependencies = [
  "combine",
  "crc",
+ "fastrand 2.0.2",
  "hmac 0.12.1",
  "once_cell",
  "openssl",
  "openssl-sys",
- "rand 0.8.5",
  "sctp-proto",
  "serde",
  "sha-1 0.10.1",
@@ -9342,7 +9391,7 @@ dependencies = [
 [[package]]
 name = "substrate-bip39"
 version = "0.4.7"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "hmac 0.12.1",
  "pbkdf2",
@@ -9354,7 +9403,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "hyper",
  "log",
@@ -9420,7 +9469,7 @@ dependencies = [
 [[package]]
 name = "substrate-relay-helper"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "anyhow",
  "async-std",
@@ -11222,7 +11271,7 @@ dependencies = [
 [[package]]
 name = "xcm-procedural"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=master#0a752afa8646ae7b5818493f64ceab3011faf236"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=bko-bridges-backports-and-nits#6cbab964cc3bd7ea3165b7ff6a55b8e497cd1bab"
 dependencies = [
  "Inflector",
  "proc-macro2 1.0.83",