diff --git a/.github/workflows/release-30_publish-draft-release.yml b/.github/workflows/release-30_publish-draft-release.yml
index ce6f31fa5483..206b1871d80a 100644
--- a/.github/workflows/release-30_publish-draft-release.yml
+++ b/.github/workflows/release-30_publish-draft-release.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Build ${{ matrix.runtime }} runtime
         id: srtool_build
-        uses: chevdor/srtool-actions@v0.7.0
+        uses: chevdor/srtool-actions@v0.8.0
         with:
           image: paritytech/srtool
           chain: ${{ matrix.runtime }}
diff --git a/Cargo.lock b/Cargo.lock
index a519f64dc1f4..56812da493f3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -777,7 +777,7 @@ dependencies = [
 [[package]]
 name = "binary-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "hash-db",
  "log",
@@ -2845,7 +2845,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2868,7 +2868,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -2893,7 +2893,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "Inflector",
  "array-bytes",
@@ -2941,7 +2941,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2952,7 +2952,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -2969,7 +2969,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2999,7 +2999,7 @@ dependencies = [
 [[package]]
 name = "frame-remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-recursion",
  "futures",
@@ -3021,7 +3021,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "aquamarine",
  "bitflags 1.3.2",
@@ -3060,7 +3060,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -3078,7 +3078,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -3090,7 +3090,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3100,7 +3100,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-executive",
@@ -3129,7 +3129,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test-pallet"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3142,7 +3142,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "cfg-if",
  "frame-support",
@@ -3161,7 +3161,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3176,7 +3176,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3185,7 +3185,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3360,7 +3360,7 @@ dependencies = [
 [[package]]
 name = "generate-bags"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "chrono",
  "frame-election-provider-support",
@@ -4359,6 +4359,7 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-std",
+ "sp-storage",
  "sp-tracing",
  "sp-transaction-pool",
  "sp-trie",
@@ -5354,7 +5355,7 @@ dependencies = [
 [[package]]
 name = "mmr-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "futures",
  "log",
@@ -5373,7 +5374,7 @@ dependencies = [
 [[package]]
 name = "mmr-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "anyhow",
  "jsonrpsee",
@@ -5900,7 +5901,7 @@ dependencies = [
 [[package]]
 name = "pallet-assets"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5916,7 +5917,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5932,7 +5933,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5946,7 +5947,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5970,7 +5971,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "aquamarine",
  "docify",
@@ -5992,7 +5993,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list-remote-tests"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-election-provider-support",
  "frame-remote-externalities",
@@ -6011,7 +6012,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6026,7 +6027,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6046,7 +6047,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "array-bytes",
  "binary-merkle-tree",
@@ -6071,7 +6072,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6089,7 +6090,7 @@ dependencies = [
 [[package]]
 name = "pallet-child-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6108,7 +6109,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6125,7 +6126,7 @@ dependencies = [
 [[package]]
 name = "pallet-conviction-voting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -6142,7 +6143,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6160,7 +6161,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6183,7 +6184,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6197,7 +6198,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6216,7 +6217,7 @@ dependencies = [
 [[package]]
 name = "pallet-fast-unstake"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -6235,7 +6236,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6258,7 +6259,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -6274,7 +6275,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6294,7 +6295,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6311,7 +6312,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6328,7 +6329,7 @@ dependencies = [
 [[package]]
 name = "pallet-message-queue"
 version = "7.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6347,7 +6348,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6365,7 +6366,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6381,7 +6382,7 @@ dependencies = [
 [[package]]
 name = "pallet-nis"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6397,7 +6398,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6416,7 +6417,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6436,7 +6437,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "pallet-nomination-pools",
  "parity-scale-codec",
@@ -6447,7 +6448,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6464,7 +6465,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6488,7 +6489,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6505,7 +6506,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6520,7 +6521,7 @@ dependencies = [
 [[package]]
 name = "pallet-ranked-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6538,7 +6539,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6553,7 +6554,7 @@ dependencies = [
 [[package]]
 name = "pallet-referenda"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -6572,7 +6573,7 @@ dependencies = [
 [[package]]
 name = "pallet-salary"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6590,7 +6591,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -6608,7 +6609,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6630,7 +6631,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6647,7 +6648,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6665,7 +6666,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6688,7 +6689,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -6699,7 +6700,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -6708,7 +6709,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6717,7 +6718,7 @@ dependencies = [
 [[package]]
 name = "pallet-state-trie-migration"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6734,7 +6735,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6749,7 +6750,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6768,7 +6769,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6787,7 +6788,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6803,7 +6804,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -6819,7 +6820,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -6831,7 +6832,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6848,7 +6849,7 @@ dependencies = [
 [[package]]
 name = "pallet-uniques"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6863,7 +6864,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6879,7 +6880,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6894,7 +6895,7 @@ dependencies = [
 [[package]]
 name = "pallet-whitelist"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8385,6 +8386,7 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-std",
+ "sp-storage",
  "sp-tracing",
  "sp-transaction-pool",
  "sp-trie",
@@ -9814,6 +9816,7 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-std",
+ "sp-storage",
  "sp-tracing",
  "sp-transaction-pool",
  "sp-trie",
@@ -10100,7 +10103,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "log",
  "sp-core",
@@ -10111,7 +10114,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "futures",
@@ -10139,7 +10142,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "futures",
  "futures-timer",
@@ -10162,7 +10165,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -10177,7 +10180,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "memmap2",
  "sc-chain-spec-derive",
@@ -10196,7 +10199,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -10207,7 +10210,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "array-bytes",
  "chrono",
@@ -10246,7 +10249,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "fnv",
  "futures",
@@ -10272,7 +10275,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -10298,7 +10301,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "futures",
@@ -10323,7 +10326,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -10359,7 +10362,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -10381,7 +10384,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "array-bytes",
  "async-channel",
@@ -10415,7 +10418,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-beefy-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -10434,7 +10437,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -10447,7 +10450,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "ahash 0.8.3",
  "array-bytes",
@@ -10488,7 +10491,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "finality-grandpa",
  "futures",
@@ -10508,7 +10511,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "futures",
@@ -10531,7 +10534,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -10553,7 +10556,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "sc-allocator",
  "sp-maybe-compressed-blob",
@@ -10565,7 +10568,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -10582,7 +10585,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "ansi_term",
  "futures",
@@ -10598,7 +10601,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "array-bytes",
  "parking_lot 0.12.1",
@@ -10612,7 +10615,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "array-bytes",
  "async-channel",
@@ -10653,7 +10656,7 @@ dependencies = [
 [[package]]
 name = "sc-network-bitswap"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-channel",
  "cid",
@@ -10673,7 +10676,7 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "bitflags 1.3.2",
@@ -10690,7 +10693,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "ahash 0.8.3",
  "futures",
@@ -10708,7 +10711,7 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "array-bytes",
  "async-channel",
@@ -10729,7 +10732,7 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "array-bytes",
  "async-channel",
@@ -10763,7 +10766,7 @@ dependencies = [
 [[package]]
 name = "sc-network-transactions"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "array-bytes",
  "futures",
@@ -10781,7 +10784,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "array-bytes",
  "bytes",
@@ -10815,7 +10818,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -10824,7 +10827,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -10855,7 +10858,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -10874,7 +10877,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "http",
  "jsonrpsee",
@@ -10889,7 +10892,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "array-bytes",
  "futures",
@@ -10917,7 +10920,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "directories",
@@ -10981,7 +10984,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -10992,7 +10995,7 @@ dependencies = [
 [[package]]
 name = "sc-storage-monitor"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "clap 4.4.0",
  "fs4",
@@ -11006,7 +11009,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -11025,7 +11028,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "futures",
  "libc",
@@ -11044,7 +11047,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "chrono",
  "futures",
@@ -11063,7 +11066,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "ansi_term",
  "atty",
@@ -11092,7 +11095,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -11103,7 +11106,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "futures",
@@ -11129,7 +11132,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "futures",
@@ -11145,7 +11148,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-channel",
  "futures",
@@ -11729,7 +11732,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "hash-db",
  "log",
@@ -11750,7 +11753,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "Inflector",
  "blake2",
@@ -11764,7 +11767,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11777,7 +11780,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -11791,7 +11794,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11804,7 +11807,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "sp-api",
  "sp-inherents",
@@ -11815,7 +11818,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "futures",
  "log",
@@ -11833,7 +11836,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "futures",
@@ -11848,7 +11851,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -11865,7 +11868,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -11884,7 +11887,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "lazy_static",
  "parity-scale-codec",
@@ -11903,7 +11906,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -11921,7 +11924,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11933,7 +11936,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "21.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "array-bytes",
  "arrayvec 0.7.4",
@@ -11980,7 +11983,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "9.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -11993,7 +11996,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "9.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "quote",
  "sp-core-hashing",
@@ -12003,7 +12006,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -12012,7 +12015,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12022,7 +12025,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.19.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -12033,7 +12036,7 @@ dependencies = [
 [[package]]
 name = "sp-genesis-builder"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "serde_json",
  "sp-api",
@@ -12044,7 +12047,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -12058,7 +12061,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "bytes",
  "ed25519-dalek",
@@ -12082,7 +12085,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -12093,7 +12096,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.27.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -12105,7 +12108,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "thiserror",
  "zstd 0.12.4",
@@ -12114,7 +12117,7 @@ dependencies = [
 [[package]]
 name = "sp-metadata-ir"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-metadata",
  "parity-scale-codec",
@@ -12125,7 +12128,7 @@ dependencies = [
 [[package]]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "ckb-merkle-mountain-range",
  "log",
@@ -12143,7 +12146,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -12157,7 +12160,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -12167,7 +12170,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -12177,7 +12180,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -12187,7 +12190,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -12209,7 +12212,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -12227,7 +12230,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -12239,7 +12242,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -12254,7 +12257,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -12268,7 +12271,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.28.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "hash-db",
  "log",
@@ -12289,7 +12292,7 @@ dependencies = [
 [[package]]
 name = "sp-statement-store"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "aes-gcm 0.10.2",
  "curve25519-dalek 4.0.0",
@@ -12313,12 +12316,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 
 [[package]]
 name = "sp-storage"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -12331,7 +12334,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -12344,7 +12347,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -12356,7 +12359,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -12365,7 +12368,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -12380,7 +12383,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "22.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "ahash 0.8.3",
  "hash-db",
@@ -12403,7 +12406,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "22.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -12420,7 +12423,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "8.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -12431,7 +12434,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
@@ -12444,7 +12447,7 @@ dependencies = [
 [[package]]
 name = "sp-weights"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -12685,12 +12688,12 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
@@ -12709,7 +12712,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "hyper",
  "log",
@@ -12721,7 +12724,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-client"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "jsonrpsee",
@@ -12734,7 +12737,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -12751,7 +12754,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -12777,7 +12780,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "futures",
  "substrate-test-utils-derive",
@@ -12787,7 +12790,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -12798,7 +12801,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "ansi_term",
  "build-helper",
@@ -13694,7 +13697,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#46c78d5173a35fd2f4a851f612bd0e3a76b102c2"
+source = "git+https://github.com/paritytech/substrate?branch=master#8dac0ab28da4e2587ebcc985cea15c9c89e5d6b1"
 dependencies = [
  "async-trait",
  "clap 4.4.0",
@@ -14692,7 +14695,6 @@ dependencies = [
  "pallet-offences-benchmarking",
  "pallet-preimage",
  "pallet-proxy",
- "pallet-ranked-collective",
  "pallet-recovery",
  "pallet-referenda",
  "pallet-scheduler",
@@ -14742,6 +14744,7 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-std",
+ "sp-storage",
  "sp-tracing",
  "sp-transaction-pool",
  "sp-version",
@@ -15172,6 +15175,7 @@ dependencies = [
  "frame-system",
  "futures",
  "pallet-xcm",
+ "parity-scale-codec",
  "polkadot-test-client",
  "polkadot-test-runtime",
  "polkadot-test-service",
diff --git a/primitives/src/v5/mod.rs b/primitives/src/v5/mod.rs
index 4e107c881d4e..59fb6c927b2d 100644
--- a/primitives/src/v5/mod.rs
+++ b/primitives/src/v5/mod.rs
@@ -1165,6 +1165,8 @@ pub struct AbridgedHostConfiguration {
 	pub validation_upgrade_cooldown: BlockNumber,
 	/// The delay, in blocks, before a validation upgrade is applied.
 	pub validation_upgrade_delay: BlockNumber,
+	/// Asynchronous backing parameters.
+	pub async_backing_params: super::vstaging::AsyncBackingParams,
 }
 
 /// Abridged version of `HrmpChannel` (from the `Hrmp` parachains host runtime module) meant to be
diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml
index a88654d26121..3a253f47dde6 100644
--- a/runtime/kusama/Cargo.toml
+++ b/runtime/kusama/Cargo.toml
@@ -34,6 +34,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
 sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
index 3d6a56cfecbd..e9e3fb2d2026 100644
--- a/runtime/kusama/src/lib.rs
+++ b/runtime/kusama/src/lib.rs
@@ -67,7 +67,7 @@ use frame_support::{
 		PrivilegeCmp, ProcessMessage, ProcessMessageError, StorageMapShim, WithdrawReasons,
 	},
 	weights::{ConstantMultiplier, WeightMeter},
-	PalletId, RuntimeDebug,
+	PalletId,
 };
 use frame_system::EnsureRoot;
 use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
@@ -82,7 +82,7 @@ use sp_runtime::{
 		Keccak256, OpaqueKeys, SaturatedConversion, Verify,
 	},
 	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill,
+	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill, RuntimeDebug,
 };
 use sp_staking::SessionIndex;
 #[cfg(any(feature = "std", test))]
@@ -2330,7 +2330,8 @@ sp_api::impl_runtime_apis! {
 			sp_runtime::RuntimeString,
 		> {
 			use frame_support::traits::WhitelistedStorageKeys;
-			use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey, BenchmarkError};
+			use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
+			use sp_storage::TrackedStorageKey;
 			// Trying to add benchmarks directly to some pallets caused cyclic dependency issues.
 			// To get around that, we separated the benchmarks into its own crate.
 			use pallet_session_benchmarking::Pallet as SessionBench;
diff --git a/runtime/parachains/src/configuration.rs b/runtime/parachains/src/configuration.rs
index 03d1ae420495..accc01a2b180 100644
--- a/runtime/parachains/src/configuration.rs
+++ b/runtime/parachains/src/configuration.rs
@@ -124,13 +124,13 @@ pub struct HostConfiguration<BlockNumber> {
 	///
 	/// [#4601]: https://github.com/paritytech/polkadot/issues/4601
 	pub validation_upgrade_delay: BlockNumber,
+	/// Asynchronous backing parameters.
+	pub async_backing_params: AsyncBackingParams,
 
 	/**
 	 * The parameters that are not essential, but still may be of interest for parachains.
 	 */
 
-	/// Asynchronous backing parameters.
-	pub async_backing_params: AsyncBackingParams,
 	/// The maximum POV block size, in bytes.
 	pub max_pov_size: u32,
 	/// The maximum size of a message that can be put in a downward message queue.
diff --git a/runtime/parachains/src/configuration/tests.rs b/runtime/parachains/src/configuration/tests.rs
index 83de7db932b4..43c03067a9a7 100644
--- a/runtime/parachains/src/configuration/tests.rs
+++ b/runtime/parachains/src/configuration/tests.rs
@@ -487,7 +487,9 @@ fn verify_externally_accessible() {
 	use primitives::{well_known_keys, AbridgedHostConfiguration};
 
 	new_test_ext(Default::default()).execute_with(|| {
-		let ground_truth = HostConfiguration::default();
+		let mut ground_truth = HostConfiguration::default();
+		ground_truth.async_backing_params =
+			AsyncBackingParams { allowed_ancestry_len: 111, max_candidate_depth: 222 };
 
 		// Make sure that the configuration is stored in the storage.
 		ActiveConfig::<Test>::put(ground_truth.clone());
@@ -511,6 +513,7 @@ fn verify_externally_accessible() {
 				hrmp_max_message_num_per_candidate: ground_truth.hrmp_max_message_num_per_candidate,
 				validation_upgrade_cooldown: ground_truth.validation_upgrade_cooldown,
 				validation_upgrade_delay: ground_truth.validation_upgrade_delay,
+				async_backing_params: ground_truth.async_backing_params,
 			},
 		);
 	});
diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml
index 5d343811fb14..76a01051a122 100644
--- a/runtime/polkadot/Cargo.toml
+++ b/runtime/polkadot/Cargo.toml
@@ -33,6 +33,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
 sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 
diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
index dca0d0d986da..c4458076cb3d 100644
--- a/runtime/polkadot/src/lib.rs
+++ b/runtime/polkadot/src/lib.rs
@@ -51,7 +51,7 @@ use frame_support::{
 		ProcessMessage, ProcessMessageError, WithdrawReasons,
 	},
 	weights::{ConstantMultiplier, WeightMeter},
-	PalletId, RuntimeDebug,
+	PalletId,
 };
 use frame_system::EnsureRoot;
 use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
@@ -78,7 +78,7 @@ use sp_runtime::{
 		OpaqueKeys, SaturatedConversion, Verify,
 	},
 	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill,
+	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill, RuntimeDebug,
 };
 use sp_staking::SessionIndex;
 use sp_std::{cmp::Ordering, collections::btree_map::BTreeMap, prelude::*};
@@ -2077,7 +2077,8 @@ sp_api::impl_runtime_apis! {
 			sp_runtime::RuntimeString,
 		> {
 			use frame_support::traits::WhitelistedStorageKeys;
-			use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey, BenchmarkError};
+			use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
+			use sp_storage::TrackedStorageKey;
 			// Trying to add benchmarks directly to some pallets caused cyclic dependency issues.
 			// To get around that, we separated the benchmarks into its own crate.
 			use pallet_session_benchmarking::Pallet as SessionBench;
diff --git a/runtime/rococo/Cargo.toml b/runtime/rococo/Cargo.toml
index 4da00f48cde0..7b9d76166d2b 100644
--- a/runtime/rococo/Cargo.toml
+++ b/runtime/rococo/Cargo.toml
@@ -31,6 +31,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
 sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
diff --git a/runtime/rococo/src/governance/fellowship.rs b/runtime/rococo/src/governance/fellowship.rs
index adccdd6ec14b..b5df6cf2df34 100644
--- a/runtime/rococo/src/governance/fellowship.rs
+++ b/runtime/rococo/src/governance/fellowship.rs
@@ -17,9 +17,7 @@
 //! Elements of governance concerning the Rococo Fellowship.
 
 use frame_support::traits::{MapSuccess, TryMapSuccess};
-use sp_runtime::{
-	traits::{ConstU16, Replace, CheckedReduceBy},
-};
+use sp_runtime::traits::{CheckedReduceBy, ConstU16, Replace};
 
 use super::*;
 use crate::{CENTS, DAYS};
diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs
index f7692e0cbc8b..c905dfecb32c 100644
--- a/runtime/rococo/src/lib.rs
+++ b/runtime/rococo/src/lib.rs
@@ -60,8 +60,8 @@ use beefy_primitives::{
 use frame_support::{
 	construct_runtime, parameter_types,
 	traits::{
-		Contains, EitherOf, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem,
-		PrivilegeCmp, ProcessMessage, ProcessMessageError, StorageMapShim, WithdrawReasons,
+		Contains, EitherOf, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, PrivilegeCmp,
+		ProcessMessage, ProcessMessageError, StorageMapShim, WithdrawReasons,
 	},
 	weights::{ConstantMultiplier, WeightMeter},
 	PalletId,
@@ -79,7 +79,7 @@ use sp_runtime::{
 		Extrinsic as ExtrinsicT, Keccak256, OpaqueKeys, SaturatedConversion, Verify,
 	},
 	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill, RuntimeDebug
+	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill, RuntimeDebug,
 };
 use sp_staking::SessionIndex;
 #[cfg(any(feature = "std", test))]
@@ -757,7 +757,7 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 			),
 			ProxyType::Governance => matches!(
 				c,
-					RuntimeCall::Bounties(..) |
+				RuntimeCall::Bounties(..) |
 					RuntimeCall::Utility(..) |
 					RuntimeCall::ChildBounties(..) |
 					// OpenGov calls
@@ -1927,9 +1927,10 @@ sp_api::impl_runtime_apis! {
 			sp_runtime::RuntimeString,
 		> {
 			use frame_support::traits::WhitelistedStorageKeys;
-			use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey, BenchmarkError};
+			use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
 			use frame_system_benchmarking::Pallet as SystemBench;
 			use frame_benchmarking::baseline::Pallet as Baseline;
+			use sp_storage::TrackedStorageKey;
 			use xcm::latest::prelude::*;
 			use xcm_config::{
 				LocalCheckAccount, LocationConverter, Rockmine, TokenLocation, XcmConfig,
diff --git a/runtime/rococo/src/xcm_config.rs b/runtime/rococo/src/xcm_config.rs
index 641b02fe680e..37c574c0405c 100644
--- a/runtime/rococo/src/xcm_config.rs
+++ b/runtime/rococo/src/xcm_config.rs
@@ -17,8 +17,8 @@
 //! XCM configuration for Rococo.
 
 use super::{
-	parachains_origin, AccountId, AllPalletsWithSystem, Balances, Fellows, ParaId, Runtime,
-	RuntimeCall, RuntimeEvent, RuntimeOrigin, WeightToFee, XcmPallet, TransactionByteFee, Dmp,
+	parachains_origin, AccountId, AllPalletsWithSystem, Balances, Dmp, Fellows, ParaId, Runtime,
+	RuntimeCall, RuntimeEvent, RuntimeOrigin, TransactionByteFee, WeightToFee, XcmPallet,
 };
 
 use crate::governance::StakingAdmin;
@@ -39,8 +39,8 @@ use sp_core::ConstU32;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
-	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom,
-	ChildParachainAsNative, ChildParachainConvertsVia, ChildSystemParachainAsSuperuser,
+	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ChildParachainAsNative,
+	ChildParachainConvertsVia, ChildSystemParachainAsSuperuser,
 	CurrencyAdapter as XcmCurrencyAdapter, FixedWeightBounds, IsChildSystemParachain, IsConcrete,
 	MintLocation, OriginToPluralityVoice, SignedAccountId32AsNative, SignedToAccountId32,
 	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
@@ -315,8 +315,8 @@ parameter_types! {
 	pub ReachableDest: Option<MultiLocation> = Some(Parachain(1000).into());
 }
 
-/// Type to convert an `Origin` type value into a `MultiLocation` value which represents an interior location
-/// of this chain.
+/// Type to convert an `Origin` type value into a `MultiLocation` value which represents an interior
+/// location of this chain.
 pub type LocalOriginToLocation = (
 	// And a usual Signed origin to be used in XCM as a corresponding AccountId32
 	SignedToAccountId32<RuntimeOrigin, AccountId, ThisNetwork>,
@@ -329,8 +329,8 @@ pub type StakingAdminToPlurality =
 /// Type to convert the Fellows origin to a Plurality `MultiLocation` value.
 pub type FellowsToPlurality = OriginToPluralityVoice<RuntimeOrigin, Fellows, FellowsBodyId>;
 
-/// Type to convert a pallet `Origin` type value into a `MultiLocation` value which represents an interior location
-/// of this chain for a destination chain.
+/// Type to convert a pallet `Origin` type value into a `MultiLocation` value which represents an
+/// interior location of this chain for a destination chain.
 pub type LocalPalletOriginToLocation = (
 	// StakingAdmin origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
 	StakingAdminToPlurality,
@@ -341,9 +341,9 @@ pub type LocalPalletOriginToLocation = (
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	// We only allow the root, fellows and the staking admin to send messages.
-	// This is basically safe to enable for everyone (safe the possibility of someone spamming the parachain
-	// if they're willing to pay the KSM to send from the Relay-chain), but it's useless until we bring in XCM v3
-	// which will make `DescendOrigin` a bit more useful.
+	// This is basically safe to enable for everyone (safe the possibility of someone spamming the
+	// parachain if they're willing to pay the KSM to send from the Relay-chain), but it's useless
+	// until we bring in XCM v3 which will make `DescendOrigin` a bit more useful.
 	type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalPalletOriginToLocation>;
 	type XcmRouter = XcmRouter;
 	// Anyone can execute XCM messages locally.
diff --git a/runtime/westend/Cargo.toml b/runtime/westend/Cargo.toml
index 1673c5230d54..ce9ddea09d5b 100644
--- a/runtime/westend/Cargo.toml
+++ b/runtime/westend/Cargo.toml
@@ -32,6 +32,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
 sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -68,7 +69,6 @@ pallet-conviction-voting = { git = "https://github.com/paritytech/substrate", br
 pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-ranked-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-referenda = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -169,7 +169,6 @@ std = [
 	"pallet-offences/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
-	"pallet-ranked-collective/std",
 	"pallet-recovery/std",
 	"pallet-referenda/std",
 	"pallet-scheduler/std",
@@ -235,7 +234,6 @@ runtime-benchmarks = [
 	"pallet-nomination-pools-benchmarking/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
-	"pallet-ranked-collective/runtime-benchmarks",
 	"pallet-recovery/runtime-benchmarks",
 	"pallet-referenda/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
@@ -287,7 +285,6 @@ try-runtime = [
 	"pallet-offences/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
-	"pallet-ranked-collective/try-runtime",
 	"pallet-recovery/try-runtime",
 	"pallet-referenda/try-runtime",
 	"pallet-scheduler/try-runtime",
diff --git a/runtime/westend/constants/src/lib.rs b/runtime/westend/constants/src/lib.rs
index f9830dab3325..e6854f8c53cd 100644
--- a/runtime/westend/constants/src/lib.rs
+++ b/runtime/westend/constants/src/lib.rs
@@ -96,6 +96,26 @@ pub mod fee {
 	}
 }
 
+/// XCM protocol related constants.
+pub mod xcm {
+	/// Pluralistic bodies existing within the consensus.
+	pub mod body {
+		// Preallocated for the Root body.
+		#[allow(dead_code)]
+		const ROOT_INDEX: u32 = 0;
+		// The bodies corresponding to the Polkadot OpenGov Origins.
+		pub const FELLOWSHIP_ADMIN_INDEX: u32 = 1;
+	}
+}
+
+/// System Parachains.
+pub mod system_parachain {
+	/// Statemint parachain ID.
+	pub const WESTMINT_ID: u32 = 1000;
+	/// Collectives parachain ID.
+	pub const COLLECTIVES_ID: u32 = 1001;
+}
+
 #[cfg(test)]
 mod tests {
 	use super::{
diff --git a/runtime/westend/src/governance/fellowship.rs b/runtime/westend/src/governance/fellowship.rs
deleted file mode 100644
index b0b25f1805f6..000000000000
--- a/runtime/westend/src/governance/fellowship.rs
+++ /dev/null
@@ -1,355 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
-
-//! Elements of governance concerning the Westend Fellowship.
-
-use frame_support::traits::{MapSuccess, TryMapSuccess};
-use sp_arithmetic::traits::CheckedSub;
-use sp_runtime::{
-	morph_types,
-	traits::{ConstU16, Replace, TypedGet},
-};
-
-use super::*;
-use crate::{CENTS, DAYS};
-
-parameter_types! {
-	pub const AlarmInterval: BlockNumber = 1;
-	pub const SubmissionDeposit: Balance = 0;
-	pub const UndecidingTimeout: BlockNumber = 7 * DAYS;
-}
-
-pub struct TracksInfo;
-impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
-	type Id = u16;
-	type RuntimeOrigin = <RuntimeOrigin as frame_support::traits::OriginTrait>::PalletsOrigin;
-	fn tracks() -> &'static [(Self::Id, pallet_referenda::TrackInfo<Balance, BlockNumber>)] {
-		static DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 10] = [
-			(
-				0u16,
-				pallet_referenda::TrackInfo {
-					name: "candidates",
-					max_deciding: 10,
-					decision_deposit: 100 * 3 * CENTS,
-					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
-					confirm_period: 30 * MINUTES,
-					min_enactment_period: 1 * MINUTES,
-					min_approval: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(50),
-						ceil: Perbill::from_percent(100),
-					},
-					min_support: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(0),
-						ceil: Perbill::from_percent(50),
-					},
-				},
-			),
-			(
-				1u16,
-				pallet_referenda::TrackInfo {
-					name: "members",
-					max_deciding: 10,
-					decision_deposit: 10 * 3 * CENTS,
-					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
-					confirm_period: 30 * MINUTES,
-					min_enactment_period: 1 * MINUTES,
-					min_approval: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(50),
-						ceil: Perbill::from_percent(100),
-					},
-					min_support: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(0),
-						ceil: Perbill::from_percent(50),
-					},
-				},
-			),
-			(
-				2u16,
-				pallet_referenda::TrackInfo {
-					name: "proficients",
-					max_deciding: 10,
-					decision_deposit: 10 * 3 * CENTS,
-					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
-					confirm_period: 30 * MINUTES,
-					min_enactment_period: 1 * MINUTES,
-					min_approval: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(50),
-						ceil: Perbill::from_percent(100),
-					},
-					min_support: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(0),
-						ceil: Perbill::from_percent(50),
-					},
-				},
-			),
-			(
-				3u16,
-				pallet_referenda::TrackInfo {
-					name: "fellows",
-					max_deciding: 10,
-					decision_deposit: 10 * 3 * CENTS,
-					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
-					confirm_period: 30 * MINUTES,
-					min_enactment_period: 1 * MINUTES,
-					min_approval: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(50),
-						ceil: Perbill::from_percent(100),
-					},
-					min_support: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(0),
-						ceil: Perbill::from_percent(50),
-					},
-				},
-			),
-			(
-				4u16,
-				pallet_referenda::TrackInfo {
-					name: "senior fellows",
-					max_deciding: 10,
-					decision_deposit: 10 * 3 * CENTS,
-					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
-					confirm_period: 30 * MINUTES,
-					min_enactment_period: 1 * MINUTES,
-					min_approval: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(50),
-						ceil: Perbill::from_percent(100),
-					},
-					min_support: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(0),
-						ceil: Perbill::from_percent(50),
-					},
-				},
-			),
-			(
-				5u16,
-				pallet_referenda::TrackInfo {
-					name: "experts",
-					max_deciding: 10,
-					decision_deposit: 1 * 3 * CENTS,
-					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
-					confirm_period: 30 * MINUTES,
-					min_enactment_period: 1 * MINUTES,
-					min_approval: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(50),
-						ceil: Perbill::from_percent(100),
-					},
-					min_support: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(0),
-						ceil: Perbill::from_percent(50),
-					},
-				},
-			),
-			(
-				6u16,
-				pallet_referenda::TrackInfo {
-					name: "senior experts",
-					max_deciding: 10,
-					decision_deposit: 1 * 3 * CENTS,
-					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
-					confirm_period: 30 * MINUTES,
-					min_enactment_period: 1 * MINUTES,
-					min_approval: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(50),
-						ceil: Perbill::from_percent(100),
-					},
-					min_support: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(0),
-						ceil: Perbill::from_percent(50),
-					},
-				},
-			),
-			(
-				7u16,
-				pallet_referenda::TrackInfo {
-					name: "masters",
-					max_deciding: 10,
-					decision_deposit: 1 * 3 * CENTS,
-					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
-					confirm_period: 30 * MINUTES,
-					min_enactment_period: 1 * MINUTES,
-					min_approval: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(50),
-						ceil: Perbill::from_percent(100),
-					},
-					min_support: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(0),
-						ceil: Perbill::from_percent(50),
-					},
-				},
-			),
-			(
-				8u16,
-				pallet_referenda::TrackInfo {
-					name: "senior masters",
-					max_deciding: 10,
-					decision_deposit: 1 * 3 * CENTS,
-					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
-					confirm_period: 30 * MINUTES,
-					min_enactment_period: 1 * MINUTES,
-					min_approval: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(50),
-						ceil: Perbill::from_percent(100),
-					},
-					min_support: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(0),
-						ceil: Perbill::from_percent(50),
-					},
-				},
-			),
-			(
-				9u16,
-				pallet_referenda::TrackInfo {
-					name: "grand masters",
-					max_deciding: 10,
-					decision_deposit: 1 * 30 * CENTS,
-					prepare_period: 30 * MINUTES,
-					decision_period: 7 * DAYS,
-					confirm_period: 30 * MINUTES,
-					min_enactment_period: 1 * MINUTES,
-					min_approval: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(50),
-						ceil: Perbill::from_percent(100),
-					},
-					min_support: pallet_referenda::Curve::LinearDecreasing {
-						length: Perbill::from_percent(100),
-						floor: Perbill::from_percent(0),
-						ceil: Perbill::from_percent(50),
-					},
-				},
-			),
-		];
-		&DATA[..]
-	}
-	fn track_for(id: &Self::RuntimeOrigin) -> Result<Self::Id, ()> {
-		use super::origins::Origin;
-
-		#[cfg(feature = "runtime-benchmarks")]
-		{
-			// For benchmarks, we enable a root origin.
-			// It is important that this is not available in production!
-			let root: Self::RuntimeOrigin = frame_system::RawOrigin::Root.into();
-			if &root == id {
-				return Ok(9)
-			}
-		}
-
-		match Origin::try_from(id.clone()) {
-			Ok(Origin::FellowshipInitiates) => Ok(0),
-			Ok(Origin::Fellowship1Dan) => Ok(1),
-			Ok(Origin::Fellowship2Dan) => Ok(2),
-			Ok(Origin::Fellowship3Dan) | Ok(Origin::Fellows) => Ok(3),
-			Ok(Origin::Fellowship4Dan) => Ok(4),
-			Ok(Origin::Fellowship5Dan) | Ok(Origin::FellowshipExperts) => Ok(5),
-			Ok(Origin::Fellowship6Dan) => Ok(6),
-			Ok(Origin::Fellowship7Dan | Origin::FellowshipMasters) => Ok(7),
-			Ok(Origin::Fellowship8Dan) => Ok(8),
-			Ok(Origin::Fellowship9Dan) => Ok(9),
-			_ => Err(()),
-		}
-	}
-}
-pallet_referenda::impl_tracksinfo_get!(TracksInfo, Balance, BlockNumber);
-
-pub type FellowshipReferendaInstance = pallet_referenda::Instance2;
-
-impl pallet_referenda::Config<FellowshipReferendaInstance> for Runtime {
-	type WeightInfo = weights::pallet_referenda_fellowship_referenda::WeightInfo<Self>;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type Scheduler = Scheduler;
-	type Currency = Balances;
-	type SubmitOrigin =
-		pallet_ranked_collective::EnsureMember<Runtime, FellowshipCollectiveInstance, 1>;
-	type CancelOrigin = FellowshipExperts;
-	type KillOrigin = FellowshipMasters;
-	type Slash = Treasury;
-	type Votes = pallet_ranked_collective::Votes;
-	type Tally = pallet_ranked_collective::TallyOf<Runtime, FellowshipCollectiveInstance>;
-	type SubmissionDeposit = SubmissionDeposit;
-	type MaxQueued = ConstU32<100>;
-	type UndecidingTimeout = UndecidingTimeout;
-	type AlarmInterval = AlarmInterval;
-	type Tracks = TracksInfo;
-	type Preimages = Preimage;
-}
-
-pub type FellowshipCollectiveInstance = pallet_ranked_collective::Instance1;
-
-morph_types! {
-	/// A `TryMorph` implementation to reduce a scalar by a particular amount, checking for
-	/// underflow.
-	pub type CheckedReduceBy<N: TypedGet>: TryMorph = |r: N::Type| -> Result<N::Type, ()> {
-		r.checked_sub(&N::get()).ok_or(())
-	} where N::Type: CheckedSub;
-}
-
-impl pallet_ranked_collective::Config<FellowshipCollectiveInstance> for Runtime {
-	type WeightInfo = weights::pallet_ranked_collective::WeightInfo<Self>;
-	type RuntimeEvent = RuntimeEvent;
-	// Promotion is by any of:
-	// - Root can demote arbitrarily.
-	// - the FellowshipAdmin origin (i.e. token holder referendum);
-	// - a vote by the rank *above* the new rank.
-	type PromoteOrigin = EitherOf<
-		frame_system::EnsureRootWithSuccess<Self::AccountId, ConstU16<65535>>,
-		EitherOf<
-			MapSuccess<FellowshipAdmin, Replace<ConstU16<9>>>,
-			TryMapSuccess<origins::EnsureFellowship, CheckedReduceBy<ConstU16<1>>>,
-		>,
-	>;
-	// Demotion is by any of:
-	// - Root can demote arbitrarily.
-	// - the FellowshipAdmin origin (i.e. token holder referendum);
-	// - a vote by the rank two above the current rank.
-	type DemoteOrigin = EitherOf<
-		frame_system::EnsureRootWithSuccess<Self::AccountId, ConstU16<65535>>,
-		EitherOf<
-			MapSuccess<FellowshipAdmin, Replace<ConstU16<9>>>,
-			TryMapSuccess<origins::EnsureFellowship, CheckedReduceBy<ConstU16<2>>>,
-		>,
-	>;
-	type Polls = FellowshipReferenda;
-	type MinRankOfClass = sp_runtime::traits::Identity;
-	type VoteWeight = pallet_ranked_collective::Geometric;
-}
diff --git a/runtime/westend/src/governance/mod.rs b/runtime/westend/src/governance/mod.rs
index b149c3fda7e6..d027f788d71f 100644
--- a/runtime/westend/src/governance/mod.rs
+++ b/runtime/westend/src/governance/mod.rs
@@ -17,22 +17,19 @@
 //! New governance configurations for the Kusama runtime.
 
 use super::*;
-use frame_support::{
-	parameter_types,
-	traits::{ConstU16, EitherOf},
-};
+use crate::xcm_config::Collectives;
+use frame_support::{parameter_types, traits::EitherOf};
 use frame_system::EnsureRootWithSuccess;
+use pallet_xcm::{EnsureXcm, IsVoiceOfBody};
+use xcm::latest::BodyId;
 
 mod origins;
 pub use origins::{
-	pallet_custom_origins, AuctionAdmin, Fellows, FellowshipAdmin, FellowshipExperts,
-	FellowshipInitiates, FellowshipMasters, GeneralAdmin, LeaseAdmin, ReferendumCanceller,
-	ReferendumKiller, Spender, StakingAdmin, Treasurer, WhitelistedCaller,
+	pallet_custom_origins, AuctionAdmin, FellowshipAdmin, GeneralAdmin, LeaseAdmin,
+	ReferendumCanceller, ReferendumKiller, Spender, StakingAdmin, Treasurer, WhitelistedCaller,
 };
 mod tracks;
 pub use tracks::TracksInfo;
-mod fellowship;
-pub use fellowship::{FellowshipCollectiveInstance, FellowshipReferendaInstance};
 
 parameter_types! {
 	pub const VoteLockingPeriod: BlockNumber = 7 * DAYS;
@@ -62,12 +59,19 @@ pub type TreasurySpender = EitherOf<EnsureRootWithSuccess<AccountId, MaxBalance>
 
 impl origins::pallet_custom_origins::Config for Runtime {}
 
+parameter_types! {
+	// Fellows pluralistic body.
+	pub const FellowsBodyId: BodyId = BodyId::Technical;
+}
+
 impl pallet_whitelist::Config for Runtime {
 	type WeightInfo = weights::pallet_whitelist::WeightInfo<Self>;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	type WhitelistOrigin =
-		EitherOf<EnsureRootWithSuccess<Self::AccountId, ConstU16<65535>>, Fellows>;
+	type WhitelistOrigin = EitherOfDiverse<
+		EnsureRoot<Self::AccountId>,
+		EnsureXcm<IsVoiceOfBody<Collectives, FellowsBodyId>>,
+	>;
 	type DispatchWhitelistedOrigin = EitherOf<EnsureRoot<Self::AccountId>, WhitelistedCaller>;
 	type Preimages = Preimage;
 }
diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
index 2a7a581ecea2..46128a051cd1 100644
--- a/runtime/westend/src/lib.rs
+++ b/runtime/westend/src/lib.rs
@@ -107,8 +107,8 @@ pub mod xcm_config;
 // Governance and configurations.
 pub mod governance;
 use governance::{
-	pallet_custom_origins, AuctionAdmin, Fellows, GeneralAdmin, LeaseAdmin, Treasurer,
-	TreasurySpender,
+	pallet_custom_origins, AuctionAdmin, FellowshipAdmin, GeneralAdmin, LeaseAdmin, StakingAdmin,
+	Treasurer, TreasurySpender,
 };
 
 #[cfg(test)]
@@ -970,8 +970,6 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				RuntimeCall::Identity(..) |
 				RuntimeCall::ConvictionVoting(..) |
 				RuntimeCall::Referenda(..) |
-				RuntimeCall::FellowshipCollective(..) |
-				RuntimeCall::FellowshipReferenda(..) |
 				RuntimeCall::Whitelist(..) |
 				RuntimeCall::Recovery(pallet_recovery::Call::as_recovered{..}) |
 				RuntimeCall::Recovery(pallet_recovery::Call::vouch_recovery{..}) |
@@ -1023,8 +1021,6 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				// OpenGov calls
 				RuntimeCall::ConvictionVoting(..) |
 					RuntimeCall::Referenda(..) |
-					RuntimeCall::FellowshipCollective(..) |
-					RuntimeCall::FellowshipReferenda(..) |
 					RuntimeCall::Whitelist(..)
 			),
 			ProxyType::IdentityJudgement => matches!(
@@ -1392,12 +1388,6 @@ construct_runtime! {
 		// OpenGov
 		ConvictionVoting: pallet_conviction_voting::{Pallet, Call, Storage, Event<T>} = 31,
 		Referenda: pallet_referenda::{Pallet, Call, Storage, Event<T>} = 32,
-		FellowshipCollective: pallet_ranked_collective::<Instance1>::{
-			Pallet, Call, Storage, Event<T>
-		} = 33,
-		FellowshipReferenda: pallet_referenda::<Instance2>::{
-			Pallet, Call, Storage, Event<T>
-		} = 34,
 		Origins: pallet_custom_origins::{Origin} = 35,
 		Whitelist: pallet_whitelist::{Pallet, Call, Storage, Event<T>} = 36,
 
@@ -1550,8 +1540,6 @@ mod benches {
 		[pallet_proxy, Proxy]
 		[pallet_recovery, Recovery]
 		[pallet_referenda, Referenda]
-		[pallet_referenda, FellowshipReferenda]
-		[pallet_ranked_collective, FellowshipCollective]
 		[pallet_scheduler, Scheduler]
 		[pallet_session, SessionBench::<Runtime>]
 		[pallet_staking, Staking]
@@ -2082,7 +2070,8 @@ sp_api::impl_runtime_apis! {
 			sp_runtime::RuntimeString,
 		> {
 			use frame_support::traits::WhitelistedStorageKeys;
-			use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey, BenchmarkError};
+			use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
+			use sp_storage::TrackedStorageKey;
 			// Trying to add benchmarks directly to some pallets caused cyclic dependency issues.
 			// To get around that, we separated the benchmarks into its own crate.
 			use pallet_session_benchmarking::Pallet as SessionBench;
diff --git a/runtime/westend/src/weights/mod.rs b/runtime/westend/src/weights/mod.rs
index 3d2807bb6740..faa94bcac586 100644
--- a/runtime/westend/src/weights/mod.rs
+++ b/runtime/westend/src/weights/mod.rs
@@ -30,7 +30,6 @@ pub mod pallet_multisig;
 pub mod pallet_nomination_pools;
 pub mod pallet_preimage;
 pub mod pallet_proxy;
-pub mod pallet_ranked_collective;
 pub mod pallet_referenda_fellowship_referenda;
 pub mod pallet_referenda_referenda;
 pub mod pallet_scheduler;
diff --git a/runtime/westend/src/weights/pallet_ranked_collective.rs b/runtime/westend/src/weights/pallet_ranked_collective.rs
deleted file mode 100644
index 21f3f651f2e3..000000000000
--- a/runtime/westend/src/weights/pallet_ranked_collective.rs
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright (C) Parity Technologies (UK) Ltd.
-// This file is part of Polkadot.
-
-// Polkadot is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Polkadot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_ranked_collective`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-06-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-e8ezs4ez-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024
-
-// Executed Command:
-// ./target/production/polkadot
-// benchmark
-// pallet
-// --chain=kusama-dev
-// --steps=50
-// --repeat=20
-// --no-storage-info
-// --no-median-slopes
-// --no-min-squares
-// --pallet=pallet_ranked_collective
-// --extrinsic=*
-// --execution=wasm
-// --wasm-execution=compiled
-// --header=./file_header.txt
-// --output=./runtime/kusama/src/weights/
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_ranked_collective`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_ranked_collective::WeightInfo for WeightInfo<T> {
-	/// Storage: FellowshipCollective Members (r:1 w:1)
-	/// Proof: FellowshipCollective Members (max_values: None, max_size: Some(42), added: 2517, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective MemberCount (r:1 w:1)
-	/// Proof: FellowshipCollective MemberCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IndexToId (r:0 w:1)
-	/// Proof: FellowshipCollective IndexToId (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IdToIndex (r:0 w:1)
-	/// Proof: FellowshipCollective IdToIndex (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	fn add_member() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76`
-		//  Estimated: `3507`
-		// Minimum execution time: 16_103_000 picoseconds.
-		Weight::from_parts(16_743_000, 0)
-			.saturating_add(Weight::from_parts(0, 3507))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: FellowshipCollective Members (r:1 w:1)
-	/// Proof: FellowshipCollective Members (max_values: None, max_size: Some(42), added: 2517, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective MemberCount (r:11 w:11)
-	/// Proof: FellowshipCollective MemberCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IdToIndex (r:11 w:11)
-	/// Proof: FellowshipCollective IdToIndex (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IndexToId (r:11 w:11)
-	/// Proof: FellowshipCollective IndexToId (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 10]`.
-	fn remove_member(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `550 + r * (281 ±0)`
-		//  Estimated: `3519 + r * (2529 ±0)`
-		// Minimum execution time: 27_225_000 picoseconds.
-		Weight::from_parts(31_460_102, 0)
-			.saturating_add(Weight::from_parts(0, 3519))
-			// Standard Error: 23_877
-			.saturating_add(Weight::from_parts(12_798_296, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(r.into())))
-			.saturating_add(Weight::from_parts(0, 2529).saturating_mul(r.into()))
-	}
-	/// Storage: FellowshipCollective Members (r:1 w:1)
-	/// Proof: FellowshipCollective Members (max_values: None, max_size: Some(42), added: 2517, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective MemberCount (r:1 w:1)
-	/// Proof: FellowshipCollective MemberCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IndexToId (r:0 w:1)
-	/// Proof: FellowshipCollective IndexToId (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IdToIndex (r:0 w:1)
-	/// Proof: FellowshipCollective IdToIndex (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 10]`.
-	fn promote_member(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `248 + r * (17 ±0)`
-		//  Estimated: `3507`
-		// Minimum execution time: 18_964_000 picoseconds.
-		Weight::from_parts(19_901_082, 0)
-			.saturating_add(Weight::from_parts(0, 3507))
-			// Standard Error: 4_560
-			.saturating_add(Weight::from_parts(326_770, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: FellowshipCollective Members (r:1 w:1)
-	/// Proof: FellowshipCollective Members (max_values: None, max_size: Some(42), added: 2517, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective MemberCount (r:1 w:1)
-	/// Proof: FellowshipCollective MemberCount (max_values: None, max_size: Some(14), added: 2489, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IdToIndex (r:1 w:1)
-	/// Proof: FellowshipCollective IdToIndex (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective IndexToId (r:1 w:1)
-	/// Proof: FellowshipCollective IndexToId (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen)
-	/// The range of component `r` is `[0, 10]`.
-	fn demote_member(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `566 + r * (72 ±0)`
-		//  Estimated: `3519`
-		// Minimum execution time: 27_310_000 picoseconds.
-		Weight::from_parts(30_386_652, 0)
-			.saturating_add(Weight::from_parts(0, 3519))
-			// Standard Error: 33_721
-			.saturating_add(Weight::from_parts(667_118, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: FellowshipCollective Members (r:1 w:0)
-	/// Proof: FellowshipCollective Members (max_values: None, max_size: Some(42), added: 2517, mode: MaxEncodedLen)
-	/// Storage: FellowshipReferenda ReferendumInfoFor (r:1 w:1)
-	/// Proof: FellowshipReferenda ReferendumInfoFor (max_values: None, max_size: Some(900), added: 3375, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective Voting (r:1 w:1)
-	/// Proof: FellowshipCollective Voting (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	/// Storage: Scheduler Agenda (r:2 w:2)
-	/// Proof: Scheduler Agenda (max_values: None, max_size: Some(38963), added: 41438, mode: MaxEncodedLen)
-	fn vote() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `638`
-		//  Estimated: `83866`
-		// Minimum execution time: 50_373_000 picoseconds.
-		Weight::from_parts(51_359_000, 0)
-			.saturating_add(Weight::from_parts(0, 83866))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: FellowshipReferenda ReferendumInfoFor (r:1 w:0)
-	/// Proof: FellowshipReferenda ReferendumInfoFor (max_values: None, max_size: Some(900), added: 3375, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective VotingCleanup (r:1 w:0)
-	/// Proof: FellowshipCollective VotingCleanup (max_values: None, max_size: Some(114), added: 2589, mode: MaxEncodedLen)
-	/// Storage: FellowshipCollective Voting (r:100 w:100)
-	/// Proof: FellowshipCollective Voting (max_values: None, max_size: Some(65), added: 2540, mode: MaxEncodedLen)
-	/// The range of component `n` is `[0, 100]`.
-	fn cleanup_poll(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `434 + n * (50 ±0)`
-		//  Estimated: `4365 + n * (2540 ±0)`
-		// Minimum execution time: 14_237_000 picoseconds.
-		Weight::from_parts(16_304_970, 0)
-			.saturating_add(Weight::from_parts(0, 4365))
-			// Standard Error: 2_460
-			.saturating_add(Weight::from_parts(1_185_342, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n.into())))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 2540).saturating_mul(n.into()))
-	}
-}
diff --git a/runtime/westend/src/xcm_config.rs b/runtime/westend/src/xcm_config.rs
index 30de3fe0f380..bdee635ea7d1 100644
--- a/runtime/westend/src/xcm_config.rs
+++ b/runtime/westend/src/xcm_config.rs
@@ -17,30 +17,31 @@
 //! XCM configurations for Westend.
 
 use super::{
-	parachains_origin, weights, AccountId, AllPalletsWithSystem, Balances, Dmp, Fellows, ParaId,
-	Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, TransactionByteFee, WeightToFee, XcmPallet,
+	parachains_origin, AccountId, AllPalletsWithSystem, Balances, Dmp, FellowshipAdmin,
+	GeneralAdmin, ParaId, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, StakingAdmin,
+	TransactionByteFee, WeightToFee, XcmPallet,
 };
 
-use crate::governance::StakingAdmin;
-
 use frame_support::{
-	parameter_types,
+	match_types, parameter_types,
 	traits::{Contains, Everything, Nothing},
 };
 use frame_system::EnsureRoot;
+use pallet_xcm::XcmPassthrough;
 use runtime_common::{
 	crowdloan, paras_registrar,
 	xcm_sender::{ChildParachainRouter, ExponentialPrice},
 	ToAuthor,
 };
 use sp_core::ConstU32;
-use westend_runtime_constants::currency::CENTS;
+use westend_runtime_constants::{
+	currency::CENTS, system_parachain::*, xcm::body::FELLOWSHIP_ADMIN_INDEX,
+};
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ChildParachainAsNative,
-	ChildParachainConvertsVia, ChildSystemParachainAsSuperuser,
-	CurrencyAdapter as XcmCurrencyAdapter, IsChildSystemParachain, IsConcrete, MintLocation,
+	ChildParachainConvertsVia, CurrencyAdapter as XcmCurrencyAdapter, IsConcrete, MintLocation,
 	OriginToPluralityVoice, SignedAccountId32AsNative, SignedToAccountId32,
 	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
 	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
@@ -50,7 +51,7 @@ use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
 parameter_types! {
 	pub const TokenLocation: MultiLocation = Here.into_location();
 	pub const ThisNetwork: NetworkId = Westend;
-	pub UniversalLocation: InteriorMultiLocation = ThisNetwork::get().into();
+	pub const UniversalLocation: InteriorMultiLocation = X1(GlobalConsensus(ThisNetwork::get()));
 	pub CheckAccount: AccountId = XcmPallet::check_account();
 	pub LocalCheckAccount: (AccountId, MintLocation) = (CheckAccount::get(), MintLocation::Local);
 	/// The asset ID for the asset that we use to pay for message delivery fees.
@@ -59,8 +60,12 @@ parameter_types! {
 	pub const BaseDeliveryFee: u128 = CENTS.saturating_mul(3);
 }
 
-pub type LocationConverter =
-	(ChildParachainConvertsVia<ParaId, AccountId>, AccountId32Aliases<ThisNetwork, AccountId>);
+pub type LocationConverter = (
+	// We can convert a child parachain using the standard `AccountId` conversion.
+	ChildParachainConvertsVia<ParaId, AccountId>,
+	// We can directly alias an `AccountId32` into a local account.
+	AccountId32Aliases<ThisNetwork, AccountId>,
+);
 
 pub type LocalAssetTransactor = XcmCurrencyAdapter<
 	// Use this currency:
@@ -76,10 +81,17 @@ pub type LocalAssetTransactor = XcmCurrencyAdapter<
 >;
 
 type LocalOriginConverter = (
+	// If the origin kind is `Sovereign`, then return a `Signed` origin with the account determined
+	// by the `LocationConverter` converter.
 	SovereignSignedViaLocation<LocationConverter, RuntimeOrigin>,
+	// If the origin kind is `Native` and the XCM origin is a child parachain, then we can express
+	// it with the special `parachains_origin::Origin` origin variant.
 	ChildParachainAsNative<parachains_origin::Origin, RuntimeOrigin>,
+	// If the origin kind is `Native` and the XCM origin is the `AccountId32` location, then it can
+	// be expressed using the `Signed` origin variant.
 	SignedAccountId32AsNative<ThisNetwork, RuntimeOrigin>,
-	ChildSystemParachainAsSuperuser<ParaId, RuntimeOrigin>,
+	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
+	XcmPassthrough<RuntimeOrigin>,
 );
 
 /// The XCM router. When we want to send an XCM message, we use this type. It amalgamates all of our
@@ -94,23 +106,28 @@ pub type XcmRouter = WithUniqueTopic<(
 )>;
 
 parameter_types! {
-	pub const Westmint: MultiLocation = Parachain(1000).into_location();
-	pub const Collectives: MultiLocation = Parachain(1001).into_location();
 	pub const Wnd: MultiAssetFilter = Wild(AllOf { fun: WildFungible, id: Concrete(TokenLocation::get()) });
+	pub const Westmint: MultiLocation = Parachain(WESTMINT_ID).into_location();
 	pub const WndForWestmint: (MultiAssetFilter, MultiLocation) = (Wnd::get(), Westmint::get());
+	pub const Collectives: MultiLocation = Parachain(COLLECTIVES_ID).into_location();
 	pub const WndForCollectives: (MultiAssetFilter, MultiLocation) = (Wnd::get(), Collectives::get());
 	pub const MaxInstructions: u32 = 100;
 	pub const MaxAssetsIntoHolding: u32 = 64;
 }
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parachain(1000).into());
-}
-
 pub type TrustedTeleporters =
 	(xcm_builder::Case<WndForWestmint>, xcm_builder::Case<WndForCollectives>);
 
+match_types! {
+	pub type OnlyParachains: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 0, interior: X1(Parachain(_)) }
+	};
+	pub type CollectivesOrFellows: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 0, interior: X1(Parachain(COLLECTIVES_ID)) } |
+		MultiLocation { parents: 0, interior: X2(Parachain(COLLECTIVES_ID), Plurality { id: BodyId::Technical, .. }) }
+	};
+}
+
 /// The barriers one of which must be passed for an XCM message to be executed.
 pub type Barrier = TrailingSetTopicAsId<(
 	// Weight that is paid for may be consumed.
@@ -121,10 +138,10 @@ pub type Barrier = TrailingSetTopicAsId<(
 		(
 			// If the message is one that immediately attemps to pay for execution, then allow it.
 			AllowTopLevelPaidExecutionFrom<Everything>,
-			// Messages coming from system parachains need not pay for execution.
-			AllowExplicitUnpaidExecutionFrom<IsChildSystemParachain<ParaId>>,
 			// Subscriptions for version tracking are OK.
-			AllowSubscriptionsFrom<Everything>,
+			AllowSubscriptionsFrom<OnlyParachains>,
+			// Collectives and Fellows plurality get free execution.
+			AllowExplicitUnpaidExecutionFrom<CollectivesOrFellows>,
 		),
 		UniversalLocation,
 		ConstU32<8>,
@@ -220,15 +237,6 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 				pallet_referenda::Call::nudge_referendum { .. } |
 				pallet_referenda::Call::one_fewer_deciding { .. },
 			) |
-			RuntimeCall::FellowshipCollective(..) |
-			RuntimeCall::FellowshipReferenda(
-				pallet_referenda::Call::place_decision_deposit { .. } |
-				pallet_referenda::Call::refund_decision_deposit { .. } |
-				pallet_referenda::Call::cancel { .. } |
-				pallet_referenda::Call::kill { .. } |
-				pallet_referenda::Call::nudge_referendum { .. } |
-				pallet_referenda::Call::one_fewer_deciding { .. },
-			) |
 			RuntimeCall::Recovery(..) |
 			RuntimeCall::Vesting(..) |
 			RuntimeCall::ElectionProviderMultiPhase(..) |
@@ -257,7 +265,9 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 			) |
 			RuntimeCall::XcmPallet(pallet_xcm::Call::limited_reserve_transfer_assets {
 				..
-			}) => true,
+			}) |
+			RuntimeCall::Whitelist(pallet_whitelist::Call::whitelist_call { .. }) |
+			RuntimeCall::Proxy(..) => true,
 			_ => false,
 		}
 	}
@@ -273,8 +283,11 @@ impl xcm_executor::Config for XcmConfig {
 	type IsTeleporter = TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
-	type Weigher =
-		WeightInfoBounds<weights::xcm::WestendXcmWeight<RuntimeCall>, RuntimeCall, MaxInstructions>;
+	type Weigher = WeightInfoBounds<
+		crate::weights::xcm::WestendXcmWeight<RuntimeCall>,
+		RuntimeCall,
+		MaxInstructions,
+	>;
 	type Trader =
 		UsingComponents<WeightToFee, TokenLocation, AccountId, Balances, ToAuthor<Runtime>>;
 	type ResponseHandler = XcmPallet;
@@ -294,33 +307,48 @@ impl xcm_executor::Config for XcmConfig {
 }
 
 parameter_types! {
+	// `GeneralAdmin` pluralistic body.
+	pub const GeneralAdminBodyId: BodyId = BodyId::Administration;
 	// StakingAdmin pluralistic body.
 	pub const StakingAdminBodyId: BodyId = BodyId::Defense;
-	// Fellows pluralistic body.
-	pub const FellowsBodyId: BodyId = BodyId::Technical;
+	// FellowshipAdmin pluralistic body.
+	pub const FellowshipAdminBodyId: BodyId = BodyId::Index(FELLOWSHIP_ADMIN_INDEX);
 }
 
+#[cfg(feature = "runtime-benchmarks")]
+parameter_types! {
+	pub ReachableDest: Option<MultiLocation> = Some(Parachain(1000).into());
+}
+
+/// Type to convert the `GeneralAdmin` origin to a Plurality `MultiLocation` value.
+pub type GeneralAdminToPlurality =
+	OriginToPluralityVoice<RuntimeOrigin, GeneralAdmin, GeneralAdminBodyId>;
+
+/// Type to convert an `Origin` type value into a `MultiLocation` value which represents an interior
+/// location of this chain.
+pub type LocalOriginToLocation = (
+	GeneralAdminToPlurality,
+	// And a usual Signed origin to be used in XCM as a corresponding AccountId32
+	SignedToAccountId32<RuntimeOrigin, AccountId, ThisNetwork>,
+);
+
 /// Type to convert the `StakingAdmin` origin to a Plurality `MultiLocation` value.
 pub type StakingAdminToPlurality =
 	OriginToPluralityVoice<RuntimeOrigin, StakingAdmin, StakingAdminBodyId>;
 
-/// Type to convert the Fellows origin to a Plurality `MultiLocation` value.
-pub type FellowsToPlurality = OriginToPluralityVoice<RuntimeOrigin, Fellows, FellowsBodyId>;
+/// Type to convert the `FellowshipAdmin` origin to a Plurality `MultiLocation` value.
+pub type FellowshipAdminToPlurality =
+	OriginToPluralityVoice<RuntimeOrigin, FellowshipAdmin, FellowshipAdminBodyId>;
 
-/// Type to convert a pallet `Origin` type value into a `MultiLocation` value which represents an interior location
-/// of this chain for a destination chain.
+/// Type to convert a pallet `Origin` type value into a `MultiLocation` value which represents an
+/// interior location of this chain for a destination chain.
 pub type LocalPalletOriginToLocation = (
+	// GeneralAdmin origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
+	GeneralAdminToPlurality,
 	// StakingAdmin origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
 	StakingAdminToPlurality,
-	// Fellows origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
-	FellowsToPlurality,
-);
-
-/// Type to convert an `Origin` type value into a `MultiLocation` value which represents an interior location
-/// of this chain.
-pub type LocalOriginToLocation = (
-	// And a usual Signed origin to be used in XCM as a corresponding AccountId32
-	SignedToAccountId32<RuntimeOrigin, AccountId, ThisNetwork>,
+	// FellowshipAdmin origin to be used in XCM as a corresponding Plurality `MultiLocation` value.
+	FellowshipAdminToPlurality,
 );
 
 impl pallet_xcm::Config for Runtime {
@@ -334,8 +362,11 @@ impl pallet_xcm::Config for Runtime {
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type XcmTeleportFilter = Everything;
 	type XcmReserveTransferFilter = Everything;
-	type Weigher =
-		WeightInfoBounds<weights::xcm::WestendXcmWeight<RuntimeCall>, RuntimeCall, MaxInstructions>;
+	type Weigher = WeightInfoBounds<
+		crate::weights::xcm::WestendXcmWeight<RuntimeCall>,
+		RuntimeCall,
+		MaxInstructions,
+	>;
 	type UniversalLocation = UniversalLocation;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
diff --git a/xcm/xcm-executor/integration-tests/Cargo.toml b/xcm/xcm-executor/integration-tests/Cargo.toml
index 18a729e082d2..cec9754baa31 100644
--- a/xcm/xcm-executor/integration-tests/Cargo.toml
+++ b/xcm/xcm-executor/integration-tests/Cargo.toml
@@ -8,6 +8,7 @@ version.workspace = true
 publish = false
 
 [dependencies]
+codec = { package = "parity-scale-codec", version = "3.6.1" }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
 futures = "0.3.21"
diff --git a/xcm/xcm-executor/integration-tests/src/lib.rs b/xcm/xcm-executor/integration-tests/src/lib.rs
index 111833e67cfb..d8c77f8317e1 100644
--- a/xcm/xcm-executor/integration-tests/src/lib.rs
+++ b/xcm/xcm-executor/integration-tests/src/lib.rs
@@ -17,7 +17,8 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg(test)]
 
-use frame_support::{codec::Encode, dispatch::GetDispatchInfo, weights::Weight};
+use codec::Encode;
+use frame_support::{dispatch::GetDispatchInfo, weights::Weight};
 use polkadot_test_client::{
 	BlockBuilderExt, ClientBlockImportExt, DefaultTestClientBuilderExt, InitPolkadotBlockBuilder,
 	TestClientBuilder, TestClientBuilderExt,
diff --git a/xcm/xcm-simulator/example/src/lib.rs b/xcm/xcm-simulator/example/src/lib.rs
index 1f6956485a84..85b8ad1c5cb7 100644
--- a/xcm/xcm-simulator/example/src/lib.rs
+++ b/xcm/xcm-simulator/example/src/lib.rs
@@ -17,8 +17,8 @@
 mod parachain;
 mod relay_chain;
 
-use frame_support::sp_tracing;
 use sp_runtime::BuildStorage;
+use sp_tracing;
 use xcm::prelude::*;
 use xcm_executor::traits::ConvertLocation;
 use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain, TestExt};