diff --git a/Cargo.lock b/Cargo.lock
index 6aedf97845e4..67c331c4e5e1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -523,7 +523,7 @@ dependencies = [
 [[package]]
 name = "binary-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "hash-db",
  "log",
@@ -2506,7 +2506,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2529,7 +2529,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -2554,7 +2554,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "Inflector",
  "array-bytes",
@@ -2602,7 +2602,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2613,7 +2613,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -2630,7 +2630,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2659,7 +2659,7 @@ dependencies = [
 [[package]]
 name = "frame-remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-recursion",
  "futures",
@@ -2680,7 +2680,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "bitflags",
  "environmental",
@@ -2714,7 +2714,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -2732,7 +2732,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -2744,7 +2744,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2754,7 +2754,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-executive",
@@ -2781,19 +2781,20 @@ dependencies = [
 [[package]]
 name = "frame-support-test-pallet"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
  "scale-info",
  "serde",
+ "sp-runtime",
 ]
 
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "cfg-if",
  "frame-support",
@@ -2812,7 +2813,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2827,7 +2828,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2836,7 +2837,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3018,7 +3019,7 @@ dependencies = [
 [[package]]
 name = "generate-bags"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "chrono",
  "frame-election-provider-support",
@@ -4951,7 +4952,7 @@ dependencies = [
 [[package]]
 name = "mmr-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "futures",
  "log",
@@ -4970,7 +4971,7 @@ dependencies = [
 [[package]]
 name = "mmr-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "anyhow",
  "jsonrpsee",
@@ -5483,7 +5484,7 @@ dependencies = [
 [[package]]
 name = "pallet-assets"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5498,7 +5499,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5514,7 +5515,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5528,7 +5529,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5552,7 +5553,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5572,7 +5573,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list-remote-tests"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-election-provider-support",
  "frame-remote-externalities",
@@ -5591,7 +5592,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5606,7 +5607,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5625,7 +5626,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "array-bytes",
  "binary-merkle-tree",
@@ -5649,7 +5650,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5667,7 +5668,7 @@ dependencies = [
 [[package]]
 name = "pallet-child-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5686,7 +5687,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5703,7 +5704,7 @@ dependencies = [
 [[package]]
 name = "pallet-conviction-voting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -5720,7 +5721,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5738,7 +5739,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5761,7 +5762,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5774,7 +5775,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5793,7 +5794,7 @@ dependencies = [
 [[package]]
 name = "pallet-fast-unstake"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5812,7 +5813,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5835,7 +5836,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5851,7 +5852,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5871,7 +5872,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5888,7 +5889,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5905,7 +5906,7 @@ dependencies = [
 [[package]]
 name = "pallet-message-queue"
 version = "7.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5924,7 +5925,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5941,7 +5942,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5957,7 +5958,7 @@ dependencies = [
 [[package]]
 name = "pallet-nis"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5973,7 +5974,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5990,7 +5991,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6010,7 +6011,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "pallet-nomination-pools",
  "parity-scale-codec",
@@ -6021,7 +6022,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6038,7 +6039,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6062,7 +6063,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6079,7 +6080,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6094,7 +6095,7 @@ dependencies = [
 [[package]]
 name = "pallet-ranked-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6112,7 +6113,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6127,7 +6128,7 @@ dependencies = [
 [[package]]
 name = "pallet-referenda"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -6146,7 +6147,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6163,7 +6164,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6184,7 +6185,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6200,7 +6201,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6219,7 +6220,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6242,7 +6243,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -6253,7 +6254,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -6262,7 +6263,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6271,7 +6272,7 @@ dependencies = [
 [[package]]
 name = "pallet-state-trie-migration"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6288,7 +6289,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6303,7 +6304,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6321,7 +6322,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6340,7 +6341,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6356,7 +6357,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -6372,7 +6373,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -6384,7 +6385,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6401,7 +6402,7 @@ dependencies = [
 [[package]]
 name = "pallet-uniques"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6416,7 +6417,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6432,7 +6433,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6447,7 +6448,7 @@ dependencies = [
 [[package]]
 name = "pallet-whitelist"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9565,7 +9566,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "log",
  "sp-core",
@@ -9576,7 +9577,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "futures",
@@ -9604,7 +9605,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "futures",
  "futures-timer",
@@ -9627,7 +9628,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -9642,7 +9643,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "memmap2",
  "sc-chain-spec-derive",
@@ -9661,7 +9662,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9672,7 +9673,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "array-bytes",
  "chrono",
@@ -9711,7 +9712,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "fnv",
  "futures",
@@ -9737,7 +9738,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -9763,7 +9764,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "futures",
@@ -9788,7 +9789,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -9824,7 +9825,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -9846,7 +9847,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "array-bytes",
  "async-channel",
@@ -9880,7 +9881,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-beefy-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -9899,7 +9900,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -9912,7 +9913,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "ahash 0.8.2",
  "array-bytes",
@@ -9953,7 +9954,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "finality-grandpa",
  "futures",
@@ -9973,7 +9974,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "futures",
@@ -9996,7 +9997,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -10018,7 +10019,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "sc-allocator",
  "sp-maybe-compressed-blob",
@@ -10030,7 +10031,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -10047,7 +10048,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "ansi_term",
  "futures",
@@ -10063,7 +10064,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "array-bytes",
  "parking_lot 0.12.1",
@@ -10077,7 +10078,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "array-bytes",
  "async-channel",
@@ -10118,7 +10119,7 @@ dependencies = [
 [[package]]
 name = "sc-network-bitswap"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-channel",
  "cid",
@@ -10138,7 +10139,7 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "bitflags",
@@ -10155,7 +10156,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "ahash 0.8.2",
  "futures",
@@ -10173,7 +10174,7 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "array-bytes",
  "async-channel",
@@ -10194,7 +10195,7 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "array-bytes",
  "async-channel",
@@ -10228,7 +10229,7 @@ dependencies = [
 [[package]]
 name = "sc-network-transactions"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "array-bytes",
  "futures",
@@ -10246,7 +10247,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "array-bytes",
  "bytes",
@@ -10280,7 +10281,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -10289,7 +10290,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -10320,7 +10321,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -10339,7 +10340,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "http",
  "jsonrpsee",
@@ -10354,7 +10355,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "array-bytes",
  "futures",
@@ -10380,7 +10381,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "directories",
@@ -10444,7 +10445,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -10455,7 +10456,7 @@ dependencies = [
 [[package]]
 name = "sc-storage-monitor"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "clap 4.2.5",
  "fs4",
@@ -10469,7 +10470,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -10488,7 +10489,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "futures",
  "libc",
@@ -10507,7 +10508,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "chrono",
  "futures",
@@ -10526,7 +10527,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "ansi_term",
  "atty",
@@ -10555,7 +10556,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -10566,7 +10567,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "futures",
@@ -10592,7 +10593,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "futures",
@@ -10608,7 +10609,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-channel",
  "futures",
@@ -11156,7 +11157,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "hash-db",
  "log",
@@ -11177,7 +11178,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "Inflector",
  "blake2",
@@ -11191,7 +11192,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11204,7 +11205,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -11218,7 +11219,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11231,7 +11232,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "sp-api",
  "sp-inherents",
@@ -11242,7 +11243,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "futures",
  "log",
@@ -11260,7 +11261,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "futures",
@@ -11275,7 +11276,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -11292,7 +11293,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -11311,7 +11312,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "lazy_static",
  "parity-scale-codec",
@@ -11330,7 +11331,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -11348,7 +11349,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11360,7 +11361,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "21.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "array-bytes",
  "bitflags",
@@ -11405,7 +11406,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "9.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -11418,7 +11419,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "9.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "quote",
  "sp-core-hashing",
@@ -11428,7 +11429,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -11437,7 +11438,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -11447,7 +11448,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.19.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -11458,7 +11459,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -11472,7 +11473,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "bytes",
  "ed25519",
@@ -11497,7 +11498,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -11508,7 +11509,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.27.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -11520,7 +11521,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "thiserror",
  "zstd 0.12.3+zstd.1.5.2",
@@ -11529,7 +11530,7 @@ dependencies = [
 [[package]]
 name = "sp-metadata-ir"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-metadata",
  "parity-scale-codec",
@@ -11540,7 +11541,7 @@ dependencies = [
 [[package]]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "ckb-merkle-mountain-range",
  "log",
@@ -11558,7 +11559,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11572,7 +11573,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -11582,7 +11583,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -11592,7 +11593,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -11602,7 +11603,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -11624,7 +11625,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -11642,7 +11643,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -11654,7 +11655,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11669,7 +11670,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -11683,7 +11684,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.28.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "hash-db",
  "log",
@@ -11704,7 +11705,7 @@ dependencies = [
 [[package]]
 name = "sp-statement-store"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11721,12 +11722,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 
 [[package]]
 name = "sp-storage"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11739,7 +11740,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -11752,7 +11753,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -11764,7 +11765,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -11773,7 +11774,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -11788,7 +11789,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "22.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "ahash 0.8.2",
  "hash-db",
@@ -11811,7 +11812,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "22.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11828,7 +11829,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -11839,7 +11840,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
@@ -11852,7 +11853,7 @@ dependencies = [
 [[package]]
 name = "sp-weights"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -12093,12 +12094,12 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
@@ -12117,7 +12118,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "hyper",
  "log",
@@ -12129,7 +12130,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-client"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "jsonrpsee",
@@ -12142,7 +12143,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -12159,7 +12160,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -12185,7 +12186,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "futures",
  "substrate-test-utils-derive",
@@ -12195,7 +12196,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -12206,7 +12207,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "ansi_term",
  "build-helper",
@@ -13110,7 +13111,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#63246b699d7e2645c8b12aae46f8f0765c682183"
+source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957"
 dependencies = [
  "async-trait",
  "clap 4.2.5",
diff --git a/node/service/src/chain_spec.rs b/node/service/src/chain_spec.rs
index 19bd0ce381fc..1253cd182264 100644
--- a/node/service/src/chain_spec.rs
+++ b/node/service/src/chain_spec.rs
@@ -350,7 +350,7 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Runt
 	const STASH: u128 = 100 * DOT;
 
 	polkadot::RuntimeGenesisConfig {
-		system: polkadot::SystemConfig { code: wasm_binary.to_vec() },
+		system: polkadot::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
 		balances: polkadot::BalancesConfig {
 			balances: endowed_accounts
 				.iter()
@@ -401,10 +401,14 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Runt
 		babe: polkadot::BabeConfig {
 			authorities: Default::default(),
 			epoch_config: Some(polkadot::BABE_GENESIS_EPOCH_CONFIG),
+			..Default::default()
 		},
 		grandpa: Default::default(),
 		im_online: Default::default(),
-		authority_discovery: polkadot::AuthorityDiscoveryConfig { keys: vec![] },
+		authority_discovery: polkadot::AuthorityDiscoveryConfig {
+			keys: vec![],
+			..Default::default()
+		},
 		claims: polkadot::ClaimsConfig { claims: vec![], vesting: vec![] },
 		vesting: polkadot::VestingConfig { vesting: vec![] },
 		treasury: Default::default(),
@@ -541,7 +545,7 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Runtim
 	const STASH: u128 = 100 * WND;
 
 	westend::RuntimeGenesisConfig {
-		system: westend::SystemConfig { code: wasm_binary.to_vec() },
+		system: westend::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
 		balances: westend::BalancesConfig {
 			balances: endowed_accounts
 				.iter()
@@ -584,10 +588,14 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Runtim
 		babe: westend::BabeConfig {
 			authorities: Default::default(),
 			epoch_config: Some(westend::BABE_GENESIS_EPOCH_CONFIG),
+			..Default::default()
 		},
 		grandpa: Default::default(),
 		im_online: Default::default(),
-		authority_discovery: westend::AuthorityDiscoveryConfig { keys: vec![] },
+		authority_discovery: westend::AuthorityDiscoveryConfig {
+			keys: vec![],
+			..Default::default()
+		},
 		vesting: westend::VestingConfig { vesting: vec![] },
 		sudo: westend::SudoConfig { key: Some(endowed_accounts[0].clone()) },
 		hrmp: Default::default(),
@@ -597,6 +605,7 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Runtim
 		paras: Default::default(),
 		registrar: westend_runtime::RegistrarConfig {
 			next_free_para_id: polkadot_primitives::LOWEST_PUBLIC_ID,
+			..Default::default()
 		},
 		xcm_pallet: Default::default(),
 		nomination_pools: Default::default(),
@@ -731,7 +740,7 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::RuntimeG
 	const STASH: u128 = 100 * KSM;
 
 	kusama::RuntimeGenesisConfig {
-		system: kusama::SystemConfig { code: wasm_binary.to_vec() },
+		system: kusama::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
 		balances: kusama::BalancesConfig {
 			balances: endowed_accounts
 				.iter()
@@ -774,10 +783,14 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::RuntimeG
 		babe: kusama::BabeConfig {
 			authorities: Default::default(),
 			epoch_config: Some(kusama::BABE_GENESIS_EPOCH_CONFIG),
+			..Default::default()
 		},
 		grandpa: Default::default(),
 		im_online: Default::default(),
-		authority_discovery: kusama::AuthorityDiscoveryConfig { keys: vec![] },
+		authority_discovery: kusama::AuthorityDiscoveryConfig {
+			keys: vec![],
+			..Default::default()
+		},
 		claims: kusama::ClaimsConfig { claims: vec![], vesting: vec![] },
 		vesting: kusama::VestingConfig { vesting: vec![] },
 		treasury: Default::default(),
@@ -1039,7 +1052,7 @@ fn rococo_staging_testnet_config_genesis(
 	const STASH: u128 = 100 * ROC;
 
 	rococo_runtime::RuntimeGenesisConfig {
-		system: rococo_runtime::SystemConfig { code: wasm_binary.to_vec() },
+		system: rococo_runtime::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
 		balances: rococo_runtime::BalancesConfig {
 			balances: endowed_accounts
 				.iter()
@@ -1073,6 +1086,7 @@ fn rococo_staging_testnet_config_genesis(
 		babe: rococo_runtime::BabeConfig {
 			authorities: Default::default(),
 			epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
+			..Default::default()
 		},
 		grandpa: Default::default(),
 		im_online: Default::default(),
@@ -1084,17 +1098,21 @@ fn rococo_staging_testnet_config_genesis(
 		},
 		technical_membership: Default::default(),
 		treasury: Default::default(),
-		authority_discovery: rococo_runtime::AuthorityDiscoveryConfig { keys: vec![] },
+		authority_discovery: rococo_runtime::AuthorityDiscoveryConfig {
+			keys: vec![],
+			..Default::default()
+		},
 		claims: rococo::ClaimsConfig { claims: vec![], vesting: vec![] },
 		vesting: rococo::VestingConfig { vesting: vec![] },
 		sudo: rococo_runtime::SudoConfig { key: Some(endowed_accounts[0].clone()) },
-		paras: rococo_runtime::ParasConfig { paras: vec![] },
+		paras: rococo_runtime::ParasConfig { paras: vec![], ..Default::default() },
 		hrmp: Default::default(),
 		configuration: rococo_runtime::ConfigurationConfig {
 			config: default_parachains_host_configuration(),
 		},
 		registrar: rococo_runtime::RegistrarConfig {
 			next_free_para_id: polkadot_primitives::LOWEST_PUBLIC_ID,
+			..Default::default()
 		},
 		xcm_pallet: Default::default(),
 		nis_counterpart_balances: Default::default(),
@@ -1347,7 +1365,7 @@ pub fn polkadot_testnet_genesis(
 	const STASH: u128 = 100 * DOT;
 
 	polkadot::RuntimeGenesisConfig {
-		system: polkadot::SystemConfig { code: wasm_binary.to_vec() },
+		system: polkadot::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
 		indices: polkadot::IndicesConfig { indices: vec![] },
 		balances: polkadot::BalancesConfig {
 			balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(),
@@ -1394,10 +1412,14 @@ pub fn polkadot_testnet_genesis(
 		babe: polkadot::BabeConfig {
 			authorities: Default::default(),
 			epoch_config: Some(polkadot::BABE_GENESIS_EPOCH_CONFIG),
+			..Default::default()
 		},
 		grandpa: Default::default(),
 		im_online: Default::default(),
-		authority_discovery: polkadot::AuthorityDiscoveryConfig { keys: vec![] },
+		authority_discovery: polkadot::AuthorityDiscoveryConfig {
+			keys: vec![],
+			..Default::default()
+		},
 		claims: polkadot::ClaimsConfig { claims: vec![], vesting: vec![] },
 		vesting: polkadot::VestingConfig { vesting: vec![] },
 		treasury: Default::default(),
@@ -1434,7 +1456,7 @@ pub fn kusama_testnet_genesis(
 	const STASH: u128 = 100 * KSM;
 
 	kusama::RuntimeGenesisConfig {
-		system: kusama::SystemConfig { code: wasm_binary.to_vec() },
+		system: kusama::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
 		indices: kusama::IndicesConfig { indices: vec![] },
 		balances: kusama::BalancesConfig {
 			balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(),
@@ -1473,10 +1495,14 @@ pub fn kusama_testnet_genesis(
 		babe: kusama::BabeConfig {
 			authorities: Default::default(),
 			epoch_config: Some(kusama::BABE_GENESIS_EPOCH_CONFIG),
+			..Default::default()
 		},
 		grandpa: Default::default(),
 		im_online: Default::default(),
-		authority_discovery: kusama::AuthorityDiscoveryConfig { keys: vec![] },
+		authority_discovery: kusama::AuthorityDiscoveryConfig {
+			keys: vec![],
+			..Default::default()
+		},
 		claims: kusama::ClaimsConfig { claims: vec![], vesting: vec![] },
 		vesting: kusama::VestingConfig { vesting: vec![] },
 		treasury: Default::default(),
@@ -1514,7 +1540,7 @@ pub fn westend_testnet_genesis(
 	const STASH: u128 = 100 * WND;
 
 	westend::RuntimeGenesisConfig {
-		system: westend::SystemConfig { code: wasm_binary.to_vec() },
+		system: westend::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
 		indices: westend::IndicesConfig { indices: vec![] },
 		balances: westend::BalancesConfig {
 			balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(),
@@ -1553,10 +1579,14 @@ pub fn westend_testnet_genesis(
 		babe: westend::BabeConfig {
 			authorities: Default::default(),
 			epoch_config: Some(westend::BABE_GENESIS_EPOCH_CONFIG),
+			..Default::default()
 		},
 		grandpa: Default::default(),
 		im_online: Default::default(),
-		authority_discovery: westend::AuthorityDiscoveryConfig { keys: vec![] },
+		authority_discovery: westend::AuthorityDiscoveryConfig {
+			keys: vec![],
+			..Default::default()
+		},
 		vesting: westend::VestingConfig { vesting: vec![] },
 		sudo: westend::SudoConfig { key: Some(root_key) },
 		hrmp: Default::default(),
@@ -1566,6 +1596,7 @@ pub fn westend_testnet_genesis(
 		paras: Default::default(),
 		registrar: westend_runtime::RegistrarConfig {
 			next_free_para_id: polkadot_primitives::LOWEST_PUBLIC_ID,
+			..Default::default()
 		},
 		xcm_pallet: Default::default(),
 		nomination_pools: Default::default(),
@@ -1595,7 +1626,7 @@ pub fn rococo_testnet_genesis(
 	const ENDOWMENT: u128 = 1_000_000 * ROC;
 
 	rococo_runtime::RuntimeGenesisConfig {
-		system: rococo_runtime::SystemConfig { code: wasm_binary.to_vec() },
+		system: rococo_runtime::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
 		beefy: Default::default(),
 		indices: rococo_runtime::IndicesConfig { indices: vec![] },
 		balances: rococo_runtime::BalancesConfig {
@@ -1624,6 +1655,7 @@ pub fn rococo_testnet_genesis(
 		babe: rococo_runtime::BabeConfig {
 			authorities: Default::default(),
 			epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
+			..Default::default()
 		},
 		grandpa: Default::default(),
 		im_online: Default::default(),
@@ -1638,7 +1670,10 @@ pub fn rococo_testnet_genesis(
 		treasury: Default::default(),
 		claims: rococo::ClaimsConfig { claims: vec![], vesting: vec![] },
 		vesting: rococo::VestingConfig { vesting: vec![] },
-		authority_discovery: rococo_runtime::AuthorityDiscoveryConfig { keys: vec![] },
+		authority_discovery: rococo_runtime::AuthorityDiscoveryConfig {
+			keys: vec![],
+			..Default::default()
+		},
 		sudo: rococo_runtime::SudoConfig { key: Some(root_key.clone()) },
 		hrmp: Default::default(),
 		configuration: rococo_runtime::ConfigurationConfig {
@@ -1647,9 +1682,10 @@ pub fn rococo_testnet_genesis(
 				..default_parachains_host_configuration()
 			},
 		},
-		paras: rococo_runtime::ParasConfig { paras: vec![] },
+		paras: rococo_runtime::ParasConfig { paras: vec![], ..Default::default() },
 		registrar: rococo_runtime::RegistrarConfig {
 			next_free_para_id: polkadot_primitives::LOWEST_PUBLIC_ID,
+			..Default::default()
 		},
 		xcm_pallet: Default::default(),
 		nis_counterpart_balances: Default::default(),
diff --git a/node/test/service/src/chain_spec.rs b/node/test/service/src/chain_spec.rs
index d48722599a67..876bbb8806b4 100644
--- a/node/test/service/src/chain_spec.rs
+++ b/node/test/service/src/chain_spec.rs
@@ -156,9 +156,13 @@ fn polkadot_testnet_genesis(
 		babe: runtime::BabeConfig {
 			authorities: vec![],
 			epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG),
+			..Default::default()
 		},
 		grandpa: Default::default(),
-		authority_discovery: runtime::AuthorityDiscoveryConfig { keys: vec![] },
+		authority_discovery: runtime::AuthorityDiscoveryConfig {
+			keys: vec![],
+			..Default::default()
+		},
 		claims: runtime::ClaimsConfig { claims: vec![], vesting: vec![] },
 		vesting: runtime::VestingConfig { vesting: vec![] },
 		sudo: runtime::SudoConfig { key: Some(root_key) },
diff --git a/runtime/common/src/assigned_slots.rs b/runtime/common/src/assigned_slots.rs
index f2da950d0b16..84d0bb184c06 100644
--- a/runtime/common/src/assigned_slots.rs
+++ b/runtime/common/src/assigned_slots.rs
@@ -557,6 +557,7 @@ mod tests {
 	use sp_runtime::{
 		traits::{BlakeTwo256, IdentityLookup},
 		transaction_validity::TransactionPriority,
+		BuildStorage,
 		DispatchError::BadOrigin,
 	};
 
@@ -569,11 +570,11 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 			Configuration: parachains_configuration::{Pallet, Call, Storage, Config<T>},
 			ParasShared: parachains_shared::{Pallet, Call, Storage},
-			Parachains: parachains_paras::{Pallet, Call, Storage, Config, Event},
+			Parachains: parachains_paras::{Pallet, Call, Storage, Config<T>, Event},
 			Slots: slots::{Pallet, Call, Storage, Event<T>},
 			AssignedSlots: assigned_slots::{Pallet, Call, Storage, Event<T>},
 		}
@@ -693,7 +694,7 @@ mod tests {
 	// This function basically just builds a genesis storage key/value store according to
 	// our desired mock up.
 	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+		let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 		pallet_balances::GenesisConfig::<Test> {
 			balances: vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)],
 		}
diff --git a/runtime/common/src/auctions.rs b/runtime/common/src/auctions.rs
index 05ef6ad59bf0..c73ef1b6961c 100644
--- a/runtime/common/src/auctions.rs
+++ b/runtime/common/src/auctions.rs
@@ -685,7 +685,10 @@ mod tests {
 	use pallet_balances;
 	use primitives::{BlockNumber, Header, Id as ParaId};
 	use sp_core::H256;
-	use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
+	use sp_runtime::{
+		traits::{BlakeTwo256, IdentityLookup},
+		BuildStorage,
+	};
 	use std::{cell::RefCell, collections::BTreeMap};
 
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -697,7 +700,7 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 			Auctions: auctions::{Pallet, Call, Storage, Event<T>},
 		}
@@ -886,7 +889,7 @@ mod tests {
 	// This function basically just builds a genesis storage key/value store according to
 	// our desired mock up.
 	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+		let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 		pallet_balances::GenesisConfig::<Test> {
 			balances: vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)],
 		}
diff --git a/runtime/common/src/claims.rs b/runtime/common/src/claims.rs
index 9715bad556a1..580c55580eab 100644
--- a/runtime/common/src/claims.rs
+++ b/runtime/common/src/claims.rs
@@ -236,7 +236,7 @@ pub mod pallet {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			// build `Claims`
 			self.claims.iter().map(|(a, b, _, _)| (*a, *b)).for_each(|(a, b)| {
@@ -710,14 +710,14 @@ mod tests {
 		assert_err, assert_noop, assert_ok,
 		dispatch::{DispatchError::BadOrigin, GetDispatchInfo, Pays},
 		ord_parameter_types, parameter_types,
-		traits::{ConstU32, ExistenceRequirement, GenesisBuild, WithdrawReasons},
+		traits::{ConstU32, ExistenceRequirement, WithdrawReasons},
 	};
 	use pallet_balances;
 	use sp_runtime::{
 		testing::Header,
 		traits::{BlakeTwo256, Identity, IdentityLookup},
 		transaction_validity::TransactionLongevity,
-		TokenError,
+		BuildStorage, TokenError,
 	};
 
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -729,7 +729,7 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 			Vesting: pallet_vesting::{Pallet, Call, Storage, Config<T>, Event<T>},
 			Claims: claims::{Pallet, Call, Storage, Config<T>, Event<T>, ValidateUnsigned},
@@ -836,7 +836,7 @@ mod tests {
 	// This function basically just builds a genesis storage key/value store according to
 	// our desired mockup.
 	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+		let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 		// We use default for brevity, but you can configure as desired if needed.
 		pallet_balances::GenesisConfig::<Test>::default()
 			.assimilate_storage(&mut t)
diff --git a/runtime/common/src/crowdloan/mod.rs b/runtime/common/src/crowdloan/mod.rs
index 6be608756669..bfe712df5296 100644
--- a/runtime/common/src/crowdloan/mod.rs
+++ b/runtime/common/src/crowdloan/mod.rs
@@ -880,7 +880,7 @@ mod tests {
 	use sp_runtime::{
 		testing::Header,
 		traits::{BlakeTwo256, IdentityLookup, TrailingZeroInput},
-		DispatchResult,
+		BuildStorage, DispatchResult,
 	};
 
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -892,7 +892,7 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 			Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>},
 		}
@@ -1110,7 +1110,7 @@ mod tests {
 	// This function basically just builds a genesis storage key/value store according to
 	// our desired mockup.
 	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+		let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 		pallet_balances::GenesisConfig::<Test> {
 			balances: vec![(1, 1000), (2, 2000), (3, 3000), (4, 4000)],
 		}
diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs
index b827b8c34103..b58cd129d8ff 100644
--- a/runtime/common/src/impls.rs
+++ b/runtime/common/src/impls.rs
@@ -114,7 +114,7 @@ mod tests {
 	use sp_runtime::{
 		testing::Header,
 		traits::{BlakeTwo256, IdentityLookup},
-		Perbill,
+		BuildStorage, Perbill,
 	};
 
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -127,10 +127,10 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 			Authorship: pallet_authorship::{Pallet, Storage},
 			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-			Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>},
+			Treasury: pallet_treasury::{Pallet, Call, Storage, Config<T>, Event<T>},
 		}
 	);
 
@@ -231,7 +231,7 @@ mod tests {
 	}
 
 	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+		let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 		// We use default for brevity, but you can configure as desired if needed.
 		pallet_balances::GenesisConfig::<Test>::default()
 			.assimilate_storage(&mut t)
diff --git a/runtime/common/src/integration_tests.rs b/runtime/common/src/integration_tests.rs
index cf879e6bb182..4ac21ff63c50 100644
--- a/runtime/common/src/integration_tests.rs
+++ b/runtime/common/src/integration_tests.rs
@@ -26,7 +26,7 @@ use crate::{
 };
 use frame_support::{
 	assert_noop, assert_ok, parameter_types,
-	traits::{ConstU32, Currency, GenesisBuild, OnFinalize, OnInitialize},
+	traits::{ConstU32, Currency, OnFinalize, OnInitialize},
 	weights::Weight,
 	PalletId,
 };
@@ -46,7 +46,7 @@ use sp_keystore::{testing::MemoryKeystore, KeystoreExt};
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup, One},
 	transaction_validity::TransactionPriority,
-	AccountId32,
+	AccountId32, BuildStorage,
 };
 use sp_std::sync::Arc;
 
@@ -76,13 +76,13 @@ frame_support::construct_runtime!(
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		// System Stuff
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned},
+		Babe: pallet_babe::{Pallet, Call, Storage, Config<T>, ValidateUnsigned},
 
 		// Parachains Runtime
 		Configuration: configuration::{Pallet, Call, Storage, Config<T>},
-		Paras: paras::{Pallet, Call, Storage, Event, Config},
+		Paras: paras::{Pallet, Call, Storage, Event, Config<T>},
 		ParasShared: shared::{Pallet, Call, Storage},
 		ParachainsOrigin: origin::{Pallet, Origin},
 
@@ -277,17 +277,15 @@ impl crowdloan::Config for Test {
 
 /// Create a new set of test externalities.
 pub fn new_test_ext() -> TestExternalities {
-	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-	GenesisBuild::<Test>::assimilate_storage(
-		&configuration::GenesisConfig {
-			config: configuration::HostConfiguration {
-				max_code_size: 2 * 1024 * 1024,      // 2 MB
-				max_head_data_size: 1 * 1024 * 1024, // 1 MB
-				..Default::default()
-			},
+	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
+	configuration::GenesisConfig::<Test> {
+		config: configuration::HostConfiguration {
+			max_code_size: 2 * 1024 * 1024,      // 2 MB
+			max_head_data_size: 1 * 1024 * 1024, // 1 MB
+			..Default::default()
 		},
-		&mut t,
-	)
+	}
+	.assimilate_storage(&mut t)
 	.unwrap();
 	let keystore = MemoryKeystore::new();
 	let mut ext: sp_io::TestExternalities = t.into();
diff --git a/runtime/common/src/paras_registrar.rs b/runtime/common/src/paras_registrar.rs
index 284decff46a5..adb360f95961 100644
--- a/runtime/common/src/paras_registrar.rs
+++ b/runtime/common/src/paras_registrar.rs
@@ -191,18 +191,20 @@ pub mod pallet {
 	pub type NextFreeParaId<T> = StorageValue<_, ParaId, ValueQuery>;
 
 	#[pallet::genesis_config]
-	pub struct GenesisConfig {
+	pub struct GenesisConfig<T: Config> {
+		#[serde(skip)]
+		pub _config: sp_std::marker::PhantomData<T>,
 		pub next_free_para_id: ParaId,
 	}
 
-	impl Default for GenesisConfig {
+	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
-			GenesisConfig { next_free_para_id: LOWEST_PUBLIC_ID }
+			GenesisConfig { next_free_para_id: LOWEST_PUBLIC_ID, _config: Default::default() }
 		}
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			NextFreeParaId::<T>::put(self.next_free_para_id);
 		}
@@ -661,7 +663,7 @@ mod tests {
 		assert_noop, assert_ok,
 		error::BadOrigin,
 		parameter_types,
-		traits::{ConstU32, GenesisBuild, OnFinalize, OnInitialize},
+		traits::{ConstU32, OnFinalize, OnInitialize},
 	};
 	use frame_system::limits;
 	use pallet_balances::Error as BalancesError;
@@ -673,7 +675,7 @@ mod tests {
 	use sp_runtime::{
 		traits::{BlakeTwo256, IdentityLookup},
 		transaction_validity::TransactionPriority,
-		Perbill,
+		BuildStorage, Perbill,
 	};
 	use sp_std::collections::btree_map::BTreeMap;
 
@@ -686,10 +688,10 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 			Configuration: configuration::{Pallet, Call, Storage, Config<T>},
-			Parachains: paras::{Pallet, Call, Storage, Config, Event},
+			Parachains: paras::{Pallet, Call, Storage, Config<T>, Event},
 			ParasShared: shared::{Pallet, Call, Storage},
 			Registrar: paras_registrar::{Pallet, Call, Storage, Event<T>},
 			ParachainsOrigin: origin::{Pallet, Origin},
@@ -797,18 +799,16 @@ mod tests {
 	}
 
 	pub fn new_test_ext() -> TestExternalities {
-		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-
-		GenesisBuild::<Test>::assimilate_storage(
-			&configuration::GenesisConfig {
-				config: configuration::HostConfiguration {
-					max_code_size: 2 * 1024 * 1024,      // 2 MB
-					max_head_data_size: 1 * 1024 * 1024, // 1 MB
-					..Default::default()
-				},
+		let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
+
+		configuration::GenesisConfig::<Test> {
+			config: configuration::HostConfiguration {
+				max_code_size: 2 * 1024 * 1024,      // 2 MB
+				max_head_data_size: 1 * 1024 * 1024, // 1 MB
+				..Default::default()
 			},
-			&mut t,
-		)
+		}
+		.assimilate_storage(&mut t)
 		.unwrap();
 
 		pallet_balances::GenesisConfig::<Test> {
diff --git a/runtime/common/src/purchase.rs b/runtime/common/src/purchase.rs
index e2864b262779..e2022a17a9d0 100644
--- a/runtime/common/src/purchase.rs
+++ b/runtime/common/src/purchase.rs
@@ -488,7 +488,7 @@ mod tests {
 	use sp_runtime::{
 		testing::Header,
 		traits::{BlakeTwo256, Dispatchable, IdentifyAccount, Identity, IdentityLookup, Verify},
-		ArithmeticError, MultiSignature,
+		ArithmeticError, BuildStorage, MultiSignature,
 	};
 
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -500,7 +500,7 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 			Vesting: pallet_vesting::{Pallet, Call, Storage, Config<T>, Event<T>},
 			Purchase: purchase::{Pallet, Call, Storage, Event<T>},
@@ -601,7 +601,7 @@ mod tests {
 	// This function basically just builds a genesis storage key/value store according to
 	// our desired mockup. It also executes our `setup` function which sets up this pallet for use.
 	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+		let t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 		let mut ext = sp_io::TestExternalities::new(t);
 		ext.execute_with(|| setup());
 		ext
diff --git a/runtime/common/src/slots/mod.rs b/runtime/common/src/slots/mod.rs
index 202062fd7ce9..acf1b98e38ee 100644
--- a/runtime/common/src/slots/mod.rs
+++ b/runtime/common/src/slots/mod.rs
@@ -507,7 +507,10 @@ mod tests {
 	use pallet_balances;
 	use primitives::{BlockNumber, Header};
 	use sp_core::H256;
-	use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
+	use sp_runtime::{
+		traits::{BlakeTwo256, IdentityLookup},
+		BuildStorage,
+	};
 
 	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 	type Block = frame_system::mocking::MockBlock<Test>;
@@ -518,7 +521,7 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
-			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 			Slots: slots::{Pallet, Call, Storage, Event<T>},
 		}
@@ -593,7 +596,7 @@ mod tests {
 	// This function basically just builds a genesis storage key/value store according to
 	// our desired mock up.
 	pub fn new_test_ext() -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+		let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 		pallet_balances::GenesisConfig::<Test> {
 			balances: vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)],
 		}
diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
index a6362d1b4312..8a40452d14fa 100644
--- a/runtime/kusama/src/lib.rs
+++ b/runtime/kusama/src/lib.rs
@@ -1369,10 +1369,10 @@ construct_runtime! {
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
 		// Basic stuff; balances is uncallable initially.
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>} = 0,
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>} = 0,
 
 		// Babe must be before session.
-		Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned} = 1,
+		Babe: pallet_babe::{Pallet, Call, Storage, Config<T>, ValidateUnsigned} = 1,
 
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2,
 		Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>} = 3,
@@ -1387,12 +1387,12 @@ construct_runtime! {
 		Offences: pallet_offences::{Pallet, Storage, Event} = 7,
 		Historical: session_historical::{Pallet} = 34,
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 8,
-		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 10,
+		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config<T>, Event, ValidateUnsigned} = 10,
 		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 11,
-		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config} = 12,
+		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config<T>} = 12,
 
 		// Governance stuff.
-		Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 18,
+		Treasury: pallet_treasury::{Pallet, Call, Storage, Config<T>, Event<T>} = 18,
 		ConvictionVoting: pallet_conviction_voting::{Pallet, Call, Storage, Event<T>} = 20,
 		Referenda: pallet_referenda::{Pallet, Call, Storage, Event<T>} = 21,
 //		pub type FellowshipCollectiveInstance = pallet_ranked_collective::Instance1;
@@ -1464,10 +1464,10 @@ construct_runtime! {
 		ParaInclusion: parachains_inclusion::{Pallet, Call, Storage, Event<T>} = 53,
 		ParaInherent: parachains_paras_inherent::{Pallet, Call, Storage, Inherent} = 54,
 		ParaScheduler: parachains_scheduler::{Pallet, Storage} = 55,
-		Paras: parachains_paras::{Pallet, Call, Storage, Event, Config, ValidateUnsigned} = 56,
+		Paras: parachains_paras::{Pallet, Call, Storage, Event, Config<T>, ValidateUnsigned} = 56,
 		Initializer: parachains_initializer::{Pallet, Call, Storage} = 57,
 		Dmp: parachains_dmp::{Pallet, Storage} = 58,
-		Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event<T>, Config} = 60,
+		Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event<T>, Config<T>} = 60,
 		ParaSessionInfo: parachains_session_info::{Pallet, Storage} = 61,
 		ParasDisputes: parachains_disputes::{Pallet, Call, Storage, Event<T>} = 62,
 		ParasSlashing: parachains_slashing::{Pallet, Call, Storage, ValidateUnsigned} = 63,
@@ -1482,7 +1482,7 @@ construct_runtime! {
 		StateTrieMigration: pallet_state_trie_migration = 98,
 
 		// Pallet for sending XCM.
-		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config} = 99,
+		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 99,
 
 		// Generalized message queue
 		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 100,
@@ -2321,8 +2321,8 @@ mod multiplier_tests {
 	where
 		F: FnMut() -> (),
 	{
-		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap()
 			.into();
 		t.execute_with(|| {
@@ -2370,8 +2370,8 @@ mod multiplier_tests {
 		frame_system::Pallet::<Runtime>::set_block_consumed_resources(Weight::MAX, 0);
 		let info = DispatchInfo { weight: Weight::MAX, ..Default::default() };
 
-		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap()
 			.into();
 		// set the minimum
@@ -2413,8 +2413,8 @@ mod multiplier_tests {
 		let mut multiplier = Multiplier::from_u32(2);
 		let mut blocks = 0;
 
-		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap()
 			.into();
 		// set the minimum
diff --git a/runtime/parachains/src/configuration.rs b/runtime/parachains/src/configuration.rs
index 472f449e58e1..c3eb86d2c006 100644
--- a/runtime/parachains/src/configuration.rs
+++ b/runtime/parachains/src/configuration.rs
@@ -528,7 +528,7 @@ pub mod pallet {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			self.config.panic_if_not_consistent();
 			ActiveConfig::<T>::put(&self.config);
diff --git a/runtime/parachains/src/hrmp.rs b/runtime/parachains/src/hrmp.rs
index 0d62ec16d74a..0aa20958ef61 100644
--- a/runtime/parachains/src/hrmp.rs
+++ b/runtime/parachains/src/hrmp.rs
@@ -436,12 +436,14 @@ pub mod pallet {
 	/// 2. `sender` and `recipient` must be valid paras.
 	#[pallet::genesis_config]
 	#[derive(DefaultNoBound)]
-	pub struct GenesisConfig {
+	pub struct GenesisConfig<T: Config> {
+		#[serde(skip)]
+		_config: sp_std::marker::PhantomData<T>,
 		preopen_hrmp_channels: Vec<(ParaId, ParaId, u32, u32)>,
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			initialize_storage::<T>(&self.preopen_hrmp_channels);
 		}
diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs
index b06a75480662..b06d8429817d 100644
--- a/runtime/parachains/src/mock.rs
+++ b/runtime/parachains/src/mock.rs
@@ -27,8 +27,7 @@ use crate::{
 use frame_support::{
 	assert_ok, parameter_types,
 	traits::{
-		Currency, GenesisBuild, ProcessMessage, ProcessMessageError, ValidatorSet,
-		ValidatorSetWithIdentification,
+		Currency, ProcessMessage, ProcessMessageError, ValidatorSet, ValidatorSetWithIdentification,
 	},
 	weights::{Weight, WeightMeter},
 };
@@ -43,7 +42,7 @@ use sp_io::TestExternalities;
 use sp_runtime::{
 	traits::{AccountIdConversion, BlakeTwo256, IdentityLookup},
 	transaction_validity::TransactionPriority,
-	Permill,
+	BuildStorage, Permill,
 };
 use std::{cell::RefCell, collections::HashMap};
 
@@ -485,9 +484,9 @@ pub fn new_test_ext(state: MockGenesisConfig) -> TestExternalities {
 	BACKING_REWARDS.with(|r| r.borrow_mut().clear());
 	AVAILABILITY_REWARDS.with(|r| r.borrow_mut().clear());
 
-	let mut t = state.system.build_storage::<Test>().unwrap();
+	let mut t = state.system.build_storage().unwrap();
 	state.configuration.assimilate_storage(&mut t).unwrap();
-	GenesisBuild::<Test>::assimilate_storage(&state.paras, &mut t).unwrap();
+	state.paras.assimilate_storage(&mut t).unwrap();
 
 	let mut ext: TestExternalities = t.into();
 	ext.register_extension(KeystoreExt(Arc::new(MemoryKeystore::new()) as KeystorePtr));
@@ -497,9 +496,9 @@ pub fn new_test_ext(state: MockGenesisConfig) -> TestExternalities {
 
 #[derive(Default)]
 pub struct MockGenesisConfig {
-	pub system: frame_system::GenesisConfig,
+	pub system: frame_system::GenesisConfig<Test>,
 	pub configuration: crate::configuration::GenesisConfig<Test>,
-	pub paras: crate::paras::GenesisConfig,
+	pub paras: crate::paras::GenesisConfig<Test>,
 }
 
 pub fn assert_last_event(generic_event: RuntimeEvent) {
diff --git a/runtime/parachains/src/paras/mod.rs b/runtime/parachains/src/paras/mod.rs
index 554a393d6057..ffed7829e807 100644
--- a/runtime/parachains/src/paras/mod.rs
+++ b/runtime/parachains/src/paras/mod.rs
@@ -768,12 +768,14 @@ pub mod pallet {
 
 	#[pallet::genesis_config]
 	#[derive(DefaultNoBound)]
-	pub struct GenesisConfig {
+	pub struct GenesisConfig<T: Config> {
+		#[serde(skip)]
+		pub _config: sp_std::marker::PhantomData<T>,
 		pub paras: Vec<(ParaId, ParaGenesisArgs)>,
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			let mut parachains = ParachainsCache::new();
 			for (id, genesis_args) in &self.paras {
diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
index cc4131e37f05..19f47c204fdf 100644
--- a/runtime/polkadot/src/lib.rs
+++ b/runtime/polkadot/src/lib.rs
@@ -1346,12 +1346,12 @@ construct_runtime! {
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
 		// Basic stuff; balances is uncallable initially.
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>} = 0,
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>} = 0,
 		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 1,
 		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 10,
 
 		// Babe must be before session.
-		Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned} = 2,
+		Babe: pallet_babe::{Pallet, Call, Storage, Config<T>, ValidateUnsigned} = 2,
 
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3,
 		Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>} = 4,
@@ -1366,9 +1366,9 @@ construct_runtime! {
 		Offences: pallet_offences::{Pallet, Storage, Event} = 8,
 		Historical: session_historical::{Pallet} = 33,
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 9,
-		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 11,
+		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config<T>, Event, ValidateUnsigned} = 11,
 		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 12,
-		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config} = 13,
+		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config<T>} = 13,
 
 		// Old governance stuff.
 		Democracy: pallet_democracy::{Pallet, Call, Storage, Config<T>, Event<T>} = 14,
@@ -1376,7 +1376,7 @@ construct_runtime! {
 		TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 16,
 		PhragmenElection: pallet_elections_phragmen::{Pallet, Call, Storage, Event<T>, Config<T>} = 17,
 		TechnicalMembership: pallet_membership::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>} = 18,
-		Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 19,
+		Treasury: pallet_treasury::{Pallet, Call, Storage, Config<T>, Event<T>} = 19,
 
 		// OpenGov stuff.
 		ConvictionVoting: pallet_conviction_voting::{Pallet, Call, Storage, Event<T>} = 20,
@@ -1426,11 +1426,11 @@ construct_runtime! {
 		ParaInclusion: parachains_inclusion::{Pallet, Call, Storage, Event<T>} = 53,
 		ParaInherent: parachains_paras_inherent::{Pallet, Call, Storage, Inherent} = 54,
 		ParaScheduler: parachains_scheduler::{Pallet, Storage} = 55,
-		Paras: parachains_paras::{Pallet, Call, Storage, Event, Config, ValidateUnsigned} = 56,
+		Paras: parachains_paras::{Pallet, Call, Storage, Event, Config<T>, ValidateUnsigned} = 56,
 		Initializer: parachains_initializer::{Pallet, Call, Storage} = 57,
 		Dmp: parachains_dmp::{Pallet, Storage} = 58,
 		// Ump 59
-		Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event<T>, Config} = 60,
+		Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event<T>, Config<T>} = 60,
 		ParaSessionInfo: parachains_session_info::{Pallet, Storage} = 61,
 		ParasDisputes: parachains_disputes::{Pallet, Call, Storage, Event<T>} = 62,
 		ParasSlashing: parachains_slashing::{Pallet, Call, Storage, ValidateUnsigned} = 63,
@@ -1442,7 +1442,7 @@ construct_runtime! {
 		Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 73,
 
 		// Pallet for sending XCM.
-		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config} = 99,
+		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 99,
 
 		// Generalized message queue
 		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 100,
@@ -2377,8 +2377,8 @@ mod multiplier_tests {
 	where
 		F: FnMut() -> (),
 	{
-		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap()
 			.into();
 		t.execute_with(|| {
@@ -2426,8 +2426,8 @@ mod multiplier_tests {
 		frame_system::Pallet::<Runtime>::set_block_consumed_resources(Weight::MAX, 0);
 		let info = DispatchInfo { weight: Weight::MAX, ..Default::default() };
 
-		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap()
 			.into();
 		// set the minimum
@@ -2469,8 +2469,8 @@ mod multiplier_tests {
 		let mut multiplier = Multiplier::from_u32(2);
 		let mut blocks = 0;
 
-		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
+		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
 			.unwrap()
 			.into();
 		// set the minimum
diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs
index 92199dcad398..9ee456aaeb8e 100644
--- a/runtime/rococo/src/lib.rs
+++ b/runtime/rococo/src/lib.rs
@@ -1365,10 +1365,10 @@ construct_runtime! {
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
 		// Basic stuff; balances is uncallable initially.
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>} = 0,
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>} = 0,
 
 		// Babe must be before session.
-		Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned} = 1,
+		Babe: pallet_babe::{Pallet, Call, Storage, Config<T>, ValidateUnsigned} = 1,
 
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2,
 		Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>} = 3,
@@ -1385,9 +1385,9 @@ construct_runtime! {
 		// refer to block<N-1> consistently. see substrate issue #11797 for details.
 		Mmr: pallet_mmr::{Pallet, Storage} = 241,
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 8,
-		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 10,
+		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config<T>, Event, ValidateUnsigned} = 10,
 		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 11,
-		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config} = 12,
+		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config<T>} = 12,
 
 		// Governance stuff; uncallable initially.
 		Democracy: pallet_democracy::{Pallet, Call, Storage, Config<T>, Event<T>} = 13,
@@ -1395,7 +1395,7 @@ construct_runtime! {
 		TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 15,
 		PhragmenElection: pallet_elections_phragmen::{Pallet, Call, Storage, Event<T>, Config<T>} = 16,
 		TechnicalMembership: pallet_membership::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>} = 17,
-		Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 18,
+		Treasury: pallet_treasury::{Pallet, Call, Storage, Config<T>, Event<T>} = 18,
 
 		// Claims. Usable initially.
 		Claims: claims::{Pallet, Call, Storage, Event<T>, Config<T>, ValidateUnsigned} = 19,
@@ -1446,23 +1446,23 @@ construct_runtime! {
 		ParaInclusion: parachains_inclusion::{Pallet, Call, Storage, Event<T>} = 53,
 		ParaInherent: parachains_paras_inherent::{Pallet, Call, Storage, Inherent} = 54,
 		ParaScheduler: parachains_scheduler::{Pallet, Storage} = 55,
-		Paras: parachains_paras::{Pallet, Call, Storage, Event, Config, ValidateUnsigned} = 56,
+		Paras: parachains_paras::{Pallet, Call, Storage, Event, Config<T>, ValidateUnsigned} = 56,
 		Initializer: parachains_initializer::{Pallet, Call, Storage} = 57,
 		Dmp: parachains_dmp::{Pallet, Storage} = 58,
-		Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event<T>, Config} = 60,
+		Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event<T>, Config<T>} = 60,
 		ParaSessionInfo: parachains_session_info::{Pallet, Storage} = 61,
 		ParasDisputes: parachains_disputes::{Pallet, Call, Storage, Event<T>} = 62,
 		ParasSlashing: parachains_slashing::{Pallet, Call, Storage, ValidateUnsigned} = 63,
 		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 64,
 
 		// Parachain Onboarding Pallets. Start indices at 70 to leave room.
-		Registrar: paras_registrar::{Pallet, Call, Storage, Event<T>, Config} = 70,
+		Registrar: paras_registrar::{Pallet, Call, Storage, Event<T>, Config<T>} = 70,
 		Slots: slots::{Pallet, Call, Storage, Event<T>} = 71,
 		Auctions: auctions::{Pallet, Call, Storage, Event<T>} = 72,
 		Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 73,
 
 		// Pallet for sending XCM.
-		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config} = 99,
+		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 99,
 
 		// Rococo specific pallets (not included in Kusama). Start indices at 240
 		//
diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs
index 7703abfc7b4f..98e661c49176 100644
--- a/runtime/test-runtime/src/lib.rs
+++ b/runtime/test-runtime/src/lib.rs
@@ -652,10 +652,10 @@ construct_runtime! {
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
 		// Basic stuff; balances is uncallable initially.
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 
 		// Must be before session.
-		Babe: pallet_babe::{Pallet, Call, Storage, Config},
+		Babe: pallet_babe::{Pallet, Call, Storage, Config<T>},
 
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
 		Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -668,8 +668,8 @@ construct_runtime! {
 		Offences: pallet_offences::{Pallet, Storage, Event},
 		Historical: session_historical::{Pallet},
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
-		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event},
-		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config},
+		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config<T>, Event},
+		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config<T>},
 
 		// Claims. Usable initially.
 		Claims: claims::{Pallet, Call, Storage, Event<T>, Config<T>, ValidateUnsigned},
diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
index bfa8b6e60f47..832f10408708 100644
--- a/runtime/westend/src/lib.rs
+++ b/runtime/westend/src/lib.rs
@@ -1150,10 +1150,10 @@ construct_runtime! {
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
 		// Basic stuff; balances is uncallable initially.
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>} = 0,
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>} = 0,
 
 		// Babe must be before session.
-		Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned} = 1,
+		Babe: pallet_babe::{Pallet, Call, Storage, Config<T>, ValidateUnsigned} = 1,
 
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2,
 		Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>} = 3,
@@ -1168,9 +1168,9 @@ construct_runtime! {
 		Offences: pallet_offences::{Pallet, Storage, Event} = 7,
 		Historical: session_historical::{Pallet} = 27,
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 8,
-		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned} = 10,
+		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config<T>, Event, ValidateUnsigned} = 10,
 		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 11,
-		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config} = 12,
+		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config<T>} = 12,
 
 		// Utility module.
 		Utility: pallet_utility::{Pallet, Call, Event} = 16,
@@ -1218,17 +1218,17 @@ construct_runtime! {
 		ParaInclusion: parachains_inclusion::{Pallet, Call, Storage, Event<T>} = 44,
 		ParaInherent: parachains_paras_inherent::{Pallet, Call, Storage, Inherent} = 45,
 		ParaScheduler: parachains_scheduler::{Pallet, Storage} = 46,
-		Paras: parachains_paras::{Pallet, Call, Storage, Event, Config, ValidateUnsigned} = 47,
+		Paras: parachains_paras::{Pallet, Call, Storage, Event, Config<T>, ValidateUnsigned} = 47,
 		Initializer: parachains_initializer::{Pallet, Call, Storage} = 48,
 		Dmp: parachains_dmp::{Pallet, Storage} = 49,
 		// RIP Ump 50
-		Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event<T>, Config} = 51,
+		Hrmp: parachains_hrmp::{Pallet, Call, Storage, Event<T>, Config<T>} = 51,
 		ParaSessionInfo: parachains_session_info::{Pallet, Storage} = 52,
 		ParasDisputes: parachains_disputes::{Pallet, Call, Storage, Event<T>} = 53,
 		ParasSlashing: parachains_slashing::{Pallet, Call, Storage, ValidateUnsigned} = 54,
 
 		// Parachain Onboarding Pallets. Start indices at 60 to leave room.
-		Registrar: paras_registrar::{Pallet, Call, Storage, Event<T>, Config} = 60,
+		Registrar: paras_registrar::{Pallet, Call, Storage, Event<T>, Config<T>} = 60,
 		Slots: slots::{Pallet, Call, Storage, Event<T>} = 61,
 		ParasSudoWrapper: paras_sudo_wrapper::{Pallet, Call} = 62,
 		Auctions: auctions::{Pallet, Call, Storage, Event<T>} = 63,
@@ -1236,7 +1236,7 @@ construct_runtime! {
 		AssignedSlots: assigned_slots::{Pallet, Call, Storage, Event<T>} = 65,
 
 		// Pallet for sending XCM.
-		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config} = 99,
+		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 99,
 
 		// Generalized message queue
 		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 100,
diff --git a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs
index a8b50215e315..0ae884784bbe 100644
--- a/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs
+++ b/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs
@@ -41,7 +41,7 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		XcmBalancesBenchmark: xcm_balances_benchmark::{Pallet},
 	}
diff --git a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs
index 5c2ca5ca7088..c84a73db052f 100644
--- a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs
+++ b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs
@@ -46,7 +46,7 @@ frame_support::construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
 		XcmGenericBenchmarks: generic::{Pallet},
 	}
 );
diff --git a/xcm/pallet-xcm/src/lib.rs b/xcm/pallet-xcm/src/lib.rs
index c53c9119bbd2..375272fcf1fe 100644
--- a/xcm/pallet-xcm/src/lib.rs
+++ b/xcm/pallet-xcm/src/lib.rs
@@ -633,19 +633,21 @@ pub mod pallet {
 	pub(super) type XcmExecutionSuspended<T: Config> = StorageValue<_, bool, ValueQuery>;
 
 	#[pallet::genesis_config]
-	pub struct GenesisConfig {
+	pub struct GenesisConfig<T: Config> {
+		#[serde(skip)]
+		pub _config: sp_std::marker::PhantomData<T>,
 		/// The default version to encode outgoing XCM messages with.
 		pub safe_xcm_version: Option<XcmVersion>,
 	}
 
-	impl Default for GenesisConfig {
+	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
-			Self { safe_xcm_version: Some(XCM_VERSION) }
+			Self { safe_xcm_version: Some(XCM_VERSION), _config: Default::default() }
 		}
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			SafeXcmVersion::<T>::set(self.safe_xcm_version);
 		}
diff --git a/xcm/pallet-xcm/src/mock.rs b/xcm/pallet-xcm/src/mock.rs
index 2d3cc385c230..0d3021b5b001 100644
--- a/xcm/pallet-xcm/src/mock.rs
+++ b/xcm/pallet-xcm/src/mock.rs
@@ -24,7 +24,7 @@ use frame_system::EnsureRoot;
 use polkadot_parachain::primitives::Id as ParaId;
 use polkadot_runtime_parachains::origin;
 use sp_core::H256;
-use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32};
+use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32, BuildStorage};
 pub use sp_std::{cell::RefCell, fmt::Debug, marker::PhantomData};
 use xcm::prelude::*;
 use xcm_builder::{
@@ -137,10 +137,10 @@ construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		ParasOrigin: origin::{Pallet, Origin},
-		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config},
+		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>},
 		TestNotifier: pallet_test_notifier::{Pallet, Call, Event<T>},
 	}
 );
@@ -384,17 +384,15 @@ pub(crate) fn buy_limited_execution<C>(
 pub(crate) fn new_test_ext_with_balances(
 	balances: Vec<(AccountId, Balance)>,
 ) -> sp_io::TestExternalities {
-	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 
 	pallet_balances::GenesisConfig::<Test> { balances }
 		.assimilate_storage(&mut t)
 		.unwrap();
 
-	<pallet_xcm::GenesisConfig as frame_support::traits::GenesisBuild<Test>>::assimilate_storage(
-		&pallet_xcm::GenesisConfig { safe_xcm_version: Some(2) },
-		&mut t,
-	)
-	.unwrap();
+	pallet_xcm::GenesisConfig::<Test> { safe_xcm_version: Some(2), ..Default::default() }
+		.assimilate_storage(&mut t)
+		.unwrap();
 
 	let mut ext = sp_io::TestExternalities::new(t);
 	ext.execute_with(|| System::set_block_number(1));
diff --git a/xcm/xcm-builder/tests/mock/mod.rs b/xcm/xcm-builder/tests/mock/mod.rs
index 6c2c8f222add..cb3ede30db23 100644
--- a/xcm/xcm-builder/tests/mock/mod.rs
+++ b/xcm/xcm-builder/tests/mock/mod.rs
@@ -22,7 +22,7 @@ use frame_support::{
 use frame_system::EnsureRoot;
 use parity_scale_codec::Encode;
 use primitive_types::H256;
-use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32};
+use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32, BuildStorage};
 use sp_std::cell::RefCell;
 
 use polkadot_parachain::primitives::Id as ParaId;
@@ -253,7 +253,7 @@ construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		ParasOrigin: origin::{Pallet, Origin},
 		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin},
@@ -261,7 +261,7 @@ construct_runtime!(
 );
 
 pub fn kusama_like_with_balances(balances: Vec<(AccountId, Balance)>) -> sp_io::TestExternalities {
-	let mut t = frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap();
+	let mut t = frame_system::GenesisConfig::<Runtime>::default().build_storage().unwrap();
 
 	pallet_balances::GenesisConfig::<Runtime> { balances }
 		.assimilate_storage(&mut t)
diff --git a/xcm/xcm-simulator/example/src/lib.rs b/xcm/xcm-simulator/example/src/lib.rs
index 704d24c3fc71..1f6956485a84 100644
--- a/xcm/xcm-simulator/example/src/lib.rs
+++ b/xcm/xcm-simulator/example/src/lib.rs
@@ -18,6 +18,7 @@ mod parachain;
 mod relay_chain;
 
 use frame_support::sp_tracing;
+use sp_runtime::BuildStorage;
 use xcm::prelude::*;
 use xcm_executor::traits::ConvertLocation;
 use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain, TestExt};
@@ -93,7 +94,7 @@ pub fn parent_account_account_id(who: sp_runtime::AccountId32) -> parachain::Acc
 pub fn para_ext(para_id: u32) -> sp_io::TestExternalities {
 	use parachain::{MsgQueue, Runtime, System};
 
-	let mut t = frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap();
+	let mut t = frame_system::GenesisConfig::<Runtime>::default().build_storage().unwrap();
 
 	pallet_balances::GenesisConfig::<Runtime> {
 		balances: vec![(ALICE, INITIAL_BALANCE), (parent_account_id(), INITIAL_BALANCE)],
@@ -113,7 +114,7 @@ pub fn para_ext(para_id: u32) -> sp_io::TestExternalities {
 pub fn relay_ext() -> sp_io::TestExternalities {
 	use relay_chain::{Runtime, RuntimeOrigin, System, Uniques};
 
-	let mut t = frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap();
+	let mut t = frame_system::GenesisConfig::<Runtime>::default().build_storage().unwrap();
 
 	pallet_balances::GenesisConfig::<Runtime> {
 		balances: vec![
diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs
index 875904ddecd9..85df21f0699c 100644
--- a/xcm/xcm-simulator/example/src/parachain.rs
+++ b/xcm/xcm-simulator/example/src/parachain.rs
@@ -458,7 +458,7 @@ construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		MsgQueue: mock_msg_queue::{Pallet, Storage, Event<T>},
 		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin},
diff --git a/xcm/xcm-simulator/example/src/relay_chain.rs b/xcm/xcm-simulator/example/src/relay_chain.rs
index b82e2c9cc306..8912553ebb2f 100644
--- a/xcm/xcm-simulator/example/src/relay_chain.rs
+++ b/xcm/xcm-simulator/example/src/relay_chain.rs
@@ -289,7 +289,7 @@ construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		ParasOrigin: origin::{Pallet, Origin},
 		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin},
diff --git a/xcm/xcm-simulator/fuzzer/src/fuzz.rs b/xcm/xcm-simulator/fuzzer/src/fuzz.rs
index b23386d79120..441b9f4d2861 100644
--- a/xcm/xcm-simulator/fuzzer/src/fuzz.rs
+++ b/xcm/xcm-simulator/fuzzer/src/fuzz.rs
@@ -20,7 +20,7 @@ mod relay_chain;
 use codec::DecodeLimit;
 use polkadot_core_primitives::AccountId;
 use polkadot_parachain::primitives::Id as ParaId;
-use sp_runtime::traits::AccountIdConversion;
+use sp_runtime::{traits::AccountIdConversion, BuildStorage};
 use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain, TestExt};
 
 use frame_support::assert_ok;
@@ -111,7 +111,7 @@ pub fn para_account_id(id: u32) -> relay_chain::AccountId {
 pub fn para_ext(para_id: u32) -> sp_io::TestExternalities {
 	use parachain::{MsgQueue, Runtime, System};
 
-	let mut t = frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap();
+	let mut t = frame_system::GenesisConfig::<Runtime>::default().build_storage().unwrap();
 
 	pallet_balances::GenesisConfig::<Runtime> {
 		balances: (0..6).map(|i| ([i; 32].into(), INITIAL_BALANCE)).collect(),
@@ -130,7 +130,7 @@ pub fn para_ext(para_id: u32) -> sp_io::TestExternalities {
 pub fn relay_ext() -> sp_io::TestExternalities {
 	use relay_chain::{Runtime, System};
 
-	let mut t = frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap();
+	let mut t = frame_system::GenesisConfig::<Runtime>::default().build_storage().unwrap();
 
 	let mut balances: Vec<(AccountId, u128)> = vec![];
 	balances.append(&mut (1..=3).map(|i| (para_account_id(i), INITIAL_BALANCE)).collect());
diff --git a/xcm/xcm-simulator/fuzzer/src/parachain.rs b/xcm/xcm-simulator/fuzzer/src/parachain.rs
index 26438f02f45f..ecb9262d73ac 100644
--- a/xcm/xcm-simulator/fuzzer/src/parachain.rs
+++ b/xcm/xcm-simulator/fuzzer/src/parachain.rs
@@ -356,7 +356,7 @@ construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		MsgQueue: mock_msg_queue::{Pallet, Storage, Event<T>},
 		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin},
diff --git a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs
index ef1339097f5a..9ce4dc7ac71f 100644
--- a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs
+++ b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs
@@ -257,7 +257,7 @@ construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
 		ParasOrigin: origin::{Pallet, Origin},
 		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin},