diff --git a/Cargo.lock b/Cargo.lock
index bd2c980e834..c5b5e876571 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4449,7 +4449,7 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
 [[package]]
 name = "kusama-runtime"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -4547,7 +4547,7 @@ dependencies = [
 [[package]]
 name = "kusama-runtime-constants"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -7030,7 +7030,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bounded-collections",
  "frame-benchmarking",
@@ -7051,7 +7051,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm-benchmarks"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7587,7 +7587,7 @@ dependencies = [
 [[package]]
 name = "polkadot-approval-distribution"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "futures",
  "polkadot-node-metrics",
@@ -7602,7 +7602,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "futures",
  "polkadot-node-network-protocol",
@@ -7616,7 +7616,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-distribution"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "derive_more",
  "fatality",
@@ -7639,7 +7639,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-recovery"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "fatality",
  "futures",
@@ -7660,7 +7660,7 @@ dependencies = [
 [[package]]
 name = "polkadot-cli"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "clap 4.1.6",
  "frame-benchmarking-cli",
@@ -7688,7 +7688,7 @@ dependencies = [
 [[package]]
 name = "polkadot-client"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "async-trait",
  "frame-benchmarking",
@@ -7731,7 +7731,7 @@ dependencies = [
 [[package]]
 name = "polkadot-collator-protocol"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "always-assert",
  "bitvec",
@@ -7753,7 +7753,7 @@ dependencies = [
 [[package]]
 name = "polkadot-core-primitives"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -7765,7 +7765,7 @@ dependencies = [
 [[package]]
 name = "polkadot-dispute-distribution"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "derive_more",
  "fatality",
@@ -7790,7 +7790,7 @@ dependencies = [
 [[package]]
 name = "polkadot-erasure-coding"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -7804,7 +7804,7 @@ dependencies = [
 [[package]]
 name = "polkadot-gossip-support"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "futures",
  "futures-timer",
@@ -7824,7 +7824,7 @@ dependencies = [
 [[package]]
 name = "polkadot-network-bridge"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "always-assert",
  "async-trait",
@@ -7848,7 +7848,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-collation-generation"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -7866,7 +7866,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-approval-voting"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bitvec",
  "derive_more",
@@ -7895,7 +7895,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-av-store"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bitvec",
  "futures",
@@ -7916,7 +7916,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-backing"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bitvec",
  "fatality",
@@ -7935,7 +7935,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "futures",
  "polkadot-node-subsystem",
@@ -7950,7 +7950,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-candidate-validation"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "async-trait",
  "futures",
@@ -7970,7 +7970,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-api"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "futures",
  "polkadot-node-metrics",
@@ -7985,7 +7985,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-selection"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "futures",
  "futures-timer",
@@ -8002,7 +8002,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "fatality",
  "futures",
@@ -8021,7 +8021,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "async-trait",
  "futures",
@@ -8038,7 +8038,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-provisioner"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bitvec",
  "fatality",
@@ -8056,7 +8056,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "always-assert",
  "assert_matches",
@@ -8092,7 +8092,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf-checker"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "futures",
  "polkadot-node-primitives",
@@ -8108,7 +8108,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-runtime-api"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "futures",
  "lru 0.9.0",
@@ -8123,7 +8123,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-jaeger"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "lazy_static",
  "log",
@@ -8141,7 +8141,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-metrics"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bs58",
  "futures",
@@ -8160,7 +8160,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-network-protocol"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8183,7 +8183,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-primitives"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bounded-vec",
  "futures",
@@ -8206,7 +8206,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -8216,7 +8216,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-test-helpers"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "async-trait",
  "futures",
@@ -8234,7 +8234,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-types"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8257,7 +8257,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-util"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8290,7 +8290,7 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "async-trait",
  "futures",
@@ -8313,7 +8313,7 @@ dependencies = [
 [[package]]
 name = "polkadot-parachain"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bounded-collections",
  "derive_more",
@@ -8412,7 +8412,7 @@ dependencies = [
 [[package]]
 name = "polkadot-performance-test"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "env_logger 0.9.0",
  "kusama-runtime",
@@ -8428,7 +8428,7 @@ dependencies = [
 [[package]]
 name = "polkadot-primitives"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bitvec",
  "hex-literal",
@@ -8454,7 +8454,7 @@ dependencies = [
 [[package]]
 name = "polkadot-rpc"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "jsonrpsee",
  "mmr-rpc",
@@ -8486,7 +8486,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -8576,7 +8576,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-common"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -8622,7 +8622,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-constants"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -8636,7 +8636,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-metrics"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bs58",
  "parity-scale-codec",
@@ -8648,7 +8648,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-parachains"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bitflags",
  "bitvec",
@@ -8692,7 +8692,7 @@ dependencies = [
 [[package]]
 name = "polkadot-service"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "async-trait",
  "frame-benchmarking-cli",
@@ -8801,7 +8801,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-distribution"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "arrayvec 0.5.2",
  "fatality",
@@ -8822,7 +8822,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-table"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -8832,7 +8832,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-client"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-subsystem",
@@ -8857,7 +8857,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-runtime"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bitvec",
  "frame-election-provider-support",
@@ -8918,7 +8918,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-service"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "frame-benchmarking",
  "frame-system",
@@ -9645,7 +9645,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "binary-merkle-tree",
  "frame-benchmarking",
@@ -9731,7 +9731,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime-constants"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -11527,7 +11527,7 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
 [[package]]
 name = "slot-range-helper"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -12846,7 +12846,7 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16"
 [[package]]
 name = "test-runtime-constants"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -13237,7 +13237,7 @@ dependencies = [
 [[package]]
 name = "tracing-gum"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-primitives",
@@ -13248,7 +13248,7 @@ dependencies = [
 [[package]]
 name = "tracing-gum-proc-macro"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "expander 0.0.6",
  "proc-macro-crate",
@@ -14305,7 +14305,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -14397,7 +14397,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime-constants"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -14800,7 +14800,7 @@ dependencies = [
 [[package]]
 name = "xcm"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "bounded-collections",
  "derivative",
@@ -14816,7 +14816,7 @@ dependencies = [
 [[package]]
 name = "xcm-builder"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -14837,7 +14837,7 @@ dependencies = [
 [[package]]
 name = "xcm-executor"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -14857,7 +14857,7 @@ dependencies = [
 [[package]]
 name = "xcm-procedural"
 version = "0.9.37"
-source = "git+https://github.com/paritytech/polkadot?branch=master#54bcee1d5615f53781d5172fcce6700dbf35dad2"
+source = "git+https://github.com/paritytech/polkadot?branch=master#3dd8331414c92f5d01d6a470eae43049099d7aa9"
 dependencies = [
  "Inflector",
  "proc-macro2",
diff --git a/parachains/runtimes/assets/statemine/tests/tests.rs b/parachains/runtimes/assets/statemine/tests/tests.rs
index 041d766a65d..2e0fdad2f14 100644
--- a/parachains/runtimes/assets/statemine/tests/tests.rs
+++ b/parachains/runtimes/assets/statemine/tests/tests.rs
@@ -154,7 +154,8 @@ fn test_asset_xcm_trader_with_refund() {
 			assert_ok!(trader.buy_weight(bought, asset.clone().into()));
 
 			// Make sure again buy_weight does return an error
-			assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::NotWithdrawable);
+			// This assert relies on the fact, that we use `TakeFirstAssetTrader` in `WeightTrader` tuple chain, which cannot be called twice
+			assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::TooExpensive);
 
 			// We actually use half of the weight
 			let weight_used = bought / 2;
diff --git a/parachains/runtimes/assets/statemint/tests/tests.rs b/parachains/runtimes/assets/statemint/tests/tests.rs
index 61811366c87..61080bcbe5b 100644
--- a/parachains/runtimes/assets/statemint/tests/tests.rs
+++ b/parachains/runtimes/assets/statemint/tests/tests.rs
@@ -160,7 +160,8 @@ fn test_asset_xcm_trader_with_refund() {
 			assert_ok!(trader.buy_weight(bought, asset.clone().into()));
 
 			// Make sure again buy_weight does return an error
-			assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::NotWithdrawable);
+			// This assert relies on the fact, that we use `TakeFirstAssetTrader` in `WeightTrader` tuple chain, which cannot be called twice
+			assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::TooExpensive);
 
 			// We actually use half of the weight
 			let weight_used = bought / 2;
diff --git a/parachains/runtimes/assets/westmint/tests/tests.rs b/parachains/runtimes/assets/westmint/tests/tests.rs
index d436b31d411..306165251af 100644
--- a/parachains/runtimes/assets/westmint/tests/tests.rs
+++ b/parachains/runtimes/assets/westmint/tests/tests.rs
@@ -155,7 +155,8 @@ fn test_asset_xcm_trader_with_refund() {
 			assert_ok!(trader.buy_weight(bought, asset.clone().into()));
 
 			// Make sure again buy_weight does return an error
-			assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::NotWithdrawable);
+			// This assert relies on the fact, that we use `TakeFirstAssetTrader` in `WeightTrader` tuple chain, which cannot be called twice
+			assert_noop!(trader.buy_weight(bought, asset.into()), XcmError::TooExpensive);
 
 			// We actually use half of the weight
 			let weight_used = bought / 2;
diff --git a/primitives/utility/src/lib.rs b/primitives/utility/src/lib.rs
index c9747b67db6..75ad7f417eb 100644
--- a/primitives/utility/src/lib.rs
+++ b/primitives/utility/src/lib.rs
@@ -315,6 +315,13 @@ pub trait ChargeWeightInFungibles<AccountId, Assets: fungibles::Inspect<AccountI
 mod tests {
 	use super::*;
 	use cumulus_primitives_core::UpwardMessage;
+	use frame_support::{
+		assert_ok,
+		dispatch::DispatchResult,
+		traits::tokens::{DepositConsequence, WithdrawConsequence},
+	};
+	use sp_runtime::DispatchError;
+	use xcm_executor::{traits::Error, Assets};
 
 	/// Validates [`validate`] for required Some(destination) and Some(message)
 	struct OkFixedXcmHashWithAssertingRequiredInputsSender;
@@ -410,4 +417,138 @@ mod tests {
 			)>(dest.into(), message)
 		);
 	}
+
+	#[test]
+	fn take_first_asset_trader_buy_weight_called_twice_throws_error() {
+		const AMOUNT: u128 = 100;
+
+		// prepare prerequisites to instantiate `TakeFirstAssetTrader`
+		type TestAccountId = u32;
+		type TestAssetId = u32;
+		type TestBalance = u128;
+		struct TestAssets;
+		impl MatchesFungibles<TestAssetId, TestBalance> for TestAssets {
+			fn matches_fungibles(a: &MultiAsset) -> Result<(TestAssetId, TestBalance), Error> {
+				match a {
+					MultiAsset { fun: Fungible(amount), id: Concrete(_id) } => Ok((1, *amount)),
+					_ => Err(Error::AssetNotHandled),
+				}
+			}
+		}
+		impl fungibles::Inspect<TestAccountId> for TestAssets {
+			type AssetId = TestAssetId;
+			type Balance = TestBalance;
+
+			fn total_issuance(_: Self::AssetId) -> Self::Balance {
+				todo!()
+			}
+
+			fn minimum_balance(_: Self::AssetId) -> Self::Balance {
+				0
+			}
+
+			fn balance(_: Self::AssetId, _: &TestAccountId) -> Self::Balance {
+				todo!()
+			}
+
+			fn reducible_balance(_: Self::AssetId, _: &TestAccountId, _: bool) -> Self::Balance {
+				todo!()
+			}
+
+			fn can_deposit(
+				_: Self::AssetId,
+				_: &TestAccountId,
+				_: Self::Balance,
+				_: bool,
+			) -> DepositConsequence {
+				todo!()
+			}
+
+			fn can_withdraw(
+				_: Self::AssetId,
+				_: &TestAccountId,
+				_: Self::Balance,
+			) -> WithdrawConsequence<Self::Balance> {
+				todo!()
+			}
+
+			fn asset_exists(_: Self::AssetId) -> bool {
+				todo!()
+			}
+		}
+		impl fungibles::Mutate<TestAccountId> for TestAssets {
+			fn mint_into(_: Self::AssetId, _: &TestAccountId, _: Self::Balance) -> DispatchResult {
+				todo!()
+			}
+
+			fn burn_from(
+				_: Self::AssetId,
+				_: &TestAccountId,
+				_: Self::Balance,
+			) -> Result<Self::Balance, DispatchError> {
+				todo!()
+			}
+		}
+		impl fungibles::Transfer<TestAccountId> for TestAssets {
+			fn transfer(
+				_: Self::AssetId,
+				_: &TestAccountId,
+				_: &TestAccountId,
+				_: Self::Balance,
+				_: bool,
+			) -> Result<Self::Balance, DispatchError> {
+				todo!()
+			}
+		}
+		impl fungibles::Unbalanced<TestAccountId> for TestAssets {
+			fn set_balance(
+				_: Self::AssetId,
+				_: &TestAccountId,
+				_: Self::Balance,
+			) -> DispatchResult {
+				todo!()
+			}
+
+			fn set_total_issuance(_: Self::AssetId, _: Self::Balance) {
+				todo!()
+			}
+		}
+
+		struct FeeChargerAssetsHandleRefund;
+		impl ChargeWeightInFungibles<TestAccountId, TestAssets> for FeeChargerAssetsHandleRefund {
+			fn charge_weight_in_fungibles(
+				_: <TestAssets as Inspect<TestAccountId>>::AssetId,
+				_: Weight,
+			) -> Result<<TestAssets as Inspect<TestAccountId>>::Balance, XcmError> {
+				Ok(AMOUNT)
+			}
+		}
+		impl TakeRevenue for FeeChargerAssetsHandleRefund {
+			fn take_revenue(_: MultiAsset) {}
+		}
+
+		// create new instance
+		type Trader = TakeFirstAssetTrader<
+			TestAccountId,
+			FeeChargerAssetsHandleRefund,
+			TestAssets,
+			TestAssets,
+			FeeChargerAssetsHandleRefund,
+		>;
+		let mut trader = <Trader as WeightTrader>::new();
+
+		// prepare test data
+		let asset: MultiAsset = (Here, AMOUNT).into();
+		let payment = Assets::from(asset.clone());
+		let weight_to_buy = Weight::from_parts(1_000, 1_000);
+
+		// lets do first call (success)
+		assert_ok!(trader.buy_weight(weight_to_buy, payment.clone()));
+
+		// lets do second call (error)
+		assert_eq!(
+			trader.buy_weight(weight_to_buy, payment.clone()),
+			Err(XcmError::NotWithdrawable)
+		);
+	}
 }